Fixes to the config and conf files
Merge pull request #31 from chadlung/master

Fixes to the config and conf files