(tox) Added more flags on tox.ini and changed dep version to dev
Merge branch 'tox' into master_pbs