Upgrade pip to 6.0.2
bump version for release of 12.0.2
Merge branch 'release/12.0.2'
Merge branch 'master' into develop

Conflicts:
	docs/changes.rst
	virtualenv.py
switch to 12.1.0 for development release
correect changelog
Merge branch 'master' into develop

Conflicts:
	docs/changes.rst
Merge branch 'develop' of github.com:pypa/virtualenv into develop