Pep8 1.5.6

This PR fixes approximately 7 zillion PEP8 violations that you get if you upgrade to PEP8 1.5.6 (e.g. in Ubuntu 14.10).