pep8 fixes
pep8 cleanup
pep8 clean up
pep8 cleanup
un-doing longline re-formatting
Merge pull request #323 from tacaswell/pep8

Pep8