Please run [pep8](https://pypi.python.org/pypi/pep8) on this code (and the rest of the python files touched by this PR) and fix the reported violations.