PEP8 fixes
Merge pull request #280 from davehunt/pep8

PEP8 fixes