pep8 fixes
Merge pull request #10 from russellb/pep8-fixes

pep8 fixes