Fixing blank line Flake8 failures
Add flake8 to Travis-CI to prevent these from coming back

Added new travis make target to skip flake8 on pypy but run it on all others
Removed duplicate flake8 since it has moved into requirements.txt
Merge branch 'master' into pr/280