moved tox dependency to travis.yml and fixed tox command.
merged changes.