Merge pull request #36 from matthiask/master

flake8-clean the code (excluding the testsuite)