Create Statement Tweaks

[jidehen]

Altered the primary key declarations in the create statements for better compatibility with tools like http://draw.io#app

[TallTed]

@jidehen -- Your second commit doesn't solve the problems of your first, which did much more than "[alter] the primary key declarations".

Please look at the conflicts.

Note that the 3917 lines you added start and end with references to a "PostgreSQL database dump", which references appear nowhere in the 3447 lines you deleted -- nor in any of the other .sql files in this repo.

It appears to me that your 3917 lines do not belong in this file at all.