Some tidying

Modified the tox file so that tox can be run alone, and made
dependencies the right way so that they are installed with the module.