Adding composite primary keys to the association tables
Changing default client config

Should now comply with Alex L's recent changes.
Small database fix
Merge pull request #77 from dannybutler/master

Adding composite primary keys to the association tables