Incidental pep8 changes

First of a series of PR's. This one has only the pep8, pylint fixes.

@cdodge @cpennington please review