Add tox.ini for tox
Merge branch 'tox'