pep8 cleanup
pep8 cleanup
pep8 cleanup
Pep8 & flake cleanup
Flake Cleanup
pyflakes cleanup
Pep8 cleanup
Merge pull request #942 from sandlbn/master

Pep8 cleanup