Travis now runs flake8 on pull requests
Merge pull request #1416 from jeremycline/travis

Travis now runs flake8 on pull requests
Merge branch '2.6-dev'