Add Ian Cordasco
Branch 2.1
Merge branch 'master' into 2.1
Sort columns by creation order or 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