Pep8

Resubmission of my original pep8 changes, broken into different commits.