Add tox config file
Merge branch 'tox-config' into develop