autopep8 to the rescue!

$ autopep8 -i -r --max-line-length 99 .
Merge pull request #215 from kstrauser/pep8

PEP 8 FTW