update conf file
Merge pull request #279 from forumbyr/master

update conf file