Add ability to run tests locally via tox, one more time update for running tests on Travis CI via make.