pep8 changes made during long refactoring

@cpennington @chrisndodge or delegates. The hopefully trivial subset of just pep8 changes.