Fixed errant tab in .travis.yml file
Merge branch '2to3' into develop