Merge pull request #23 from dannybutler/master

Added command line arguments to server script
Merge pull request #24 from dannybutler/master

Removing merge mistake
Finished Postgres stat collection
Merge pull request #25 from alexanderson/master

Finished Postgres stat collection
Merge remote-tracking branch 'upstream/master'