"Refactor" this super important file
Merge branch 'master' of https://github.com/Tox/toxic