Merge pull request #49 from dannybutler/master

A few table changes
Merge pull request #50 from dannybutler/master

Adding server config file