Pep8 cleanup.

@mulby @brianhw @rocha 

Brings pep8 violations down to zero.