Merge pull request #331 from alex/flake8

Start whacking at newline counts for flake8