fix paren here
Merge branch 'master' into xdist_poc
- reorganize tox options