Stop using mirrors for pip as per PEP449
Merge branch 'develop' into tox

Conflicts:
	tox.ini