Tons of pep8 changes

Lots of commits of pep8 changes for you to add.