Update tox.ini
Merge branch 'tox' into travis-ci
Update Travis CI conf