Change some things with the config.
Merge pull request #37 from johnb30/fixes

Change some things with the config.