Merge pull request #332 from alex/more-flake8

More flake8-ification