Merge pull request #25 from chadlung/master

Clean up some PEP8 issues
Adjust SIGTERM and SIGINT location, fix config