add tox.ini
Merge remote-tracking branch 'upstream/master' into py3