pep8 fixes
Merge pull request #20 from jkoelker/pep8

pep8 fixes