Update our tox configuration
Fix the travis configuration