Upgrade pip to 6.0.1
Bump version to 12.0.1 for release
Merge branch 'release/12.0.1'
Merge branch 'master' into develop

Conflicts:
	docs/changes.rst
	virtualenv.py