Adjust tox and travis to be in sync

Also drop trying to run tox tests against master as installing from
Github doesn't work well with tox.