Update pep8 to 1.5.7

This is just to keep us on the upgrade treadmill. ([Changelog](https://pypi.python.org/pypi/pep8#changelog))
@dmitchell / @cpennington Did you want/need these commented out lines in the code or should they be removed?