Add in tox support, also some pep8 fixes