pep8&pyflakes fixes

mostly automatically fixed
Merge branch '0.3.4-cleanups'