Mods to tox and travis config.