Updated to use Tox and my requirements layout