A lot of code cleanup, makign the ugly into pretty. Latest tox core.
Merge branch 'master' of https://github.com/Jman012/Toxicity