Tables in SELECT...FROM clause are sorted alphabetically
Merge branch '2.1'
Add first pass at tox.ini config file
Simplify travis-ci configuration
Add pyflakes environments
Use flake8 instead of just pyflakes