pep8 cleanup
more pep8 cleanup
Merge pull request #1 from reinbach/develop

pep8 cleanup