Add tox and mess with travis a bit more