First pass at moving some things to config, begin cleaning up code
Merge pull request #15 from mcpeak/master

First pass at moving some things to config, begin cleaning up code