Re-add tox as a travis dep