Added info about tox, so people can use it prior to a PR
Merge branch 'master' into pr/346