Merge pull request #5993 from davisagli/tox-parallel

Run tox in parallel using -p instead of detox

Makefile

@@ -4,7 +4,7 @@ init:
 	pip install -r requirements-dev.txt
 test:
 	# This runs all of the tests, on both Python 2 and Python 3.
-	detox
+	tox -p
 ci:
 	pytest tests --junitxml=report.xml