pep8 fixes
sync with upstream
Merge pull request #35 from cgtx/master

pep8 fixes