PEP8 all the things!

see http://legacy.python.org/dev/peps/pep-0008/