Update tox.ini and .travis.yml