Trying to fix up make, tox, etc
Wherps meant to have tox in here