Cleanup, added tox to test on whole range of python versions