Adding tox configuration
Merge branch 'tox' into python3