Merge pull request #8 from dustinfarris/cleanup

Clean up the mess
Typo
Merge remote-tracking branch 'origin/master' into update-configs
Merge branch 'update-configs' into staging