Downgrade ez_setup.py to 2.2 for Travis CI
Merge branch '1.7'