Clean up some PEP8 issues
Merge pull request #25 from chadlung/master

Clean up some PEP8 issues