Config clean up and usage messaging.
Merge pull request #317 from benbjohnson/fix-help-flag

Config clean up and usage messaging.