Updated travis to use tox
Updated tox to not throw errors on make command