Removed a bunch of old code, added command-line flags for config
Merge branch 'master' of https://github.com/CodePilotCo/CMS