flake8 pass (pep8 and pyflakes)
Test fixes after flake8 run
Merge pull request #59 from mrtheb/master

flake8 (pep8 and pyflakes) clean-up