pep8
Merge pull request #19 from calebgroom/master

pep8 cleanup