merge: Upgrade pip to 7.0 and setuptools to 16.0

Lib/ensurepip/__init__.py

@@ -8,9 +8,9 @@ import tempfile
 __all__ = ["version", "bootstrap"]
 
 
-_SETUPTOOLS_VERSION = "15.2"
+_SETUPTOOLS_VERSION = "16.0"
 
-_PIP_VERSION = "6.1.1"
+_PIP_VERSION = "7.0.0"
 
 # pip currently requires ssl support, so we try to provide a nicer
 # error message when that is missing (http://bugs.python.org/issue19744)