made changes to how pip gets deployed

Changes to be committed:
	modified:   modules/deploy.py
	modified:   modules/pip.py

modules/deploy.py

@@ -8,8 +8,7 @@ from utils import virtualenv_source, booleanize, loggify
 from utils import print_console
 
 from pip import setup_virtualenv
-from pip import setup as pip_requirements
-from pip import upgrade as pip_upgrade
+from pip import bootstrap_pip
 
 import os
 
@@ -79,9 +78,7 @@ def bootstrap():
     setup_rootpath()
 
     setup_virtualenv()
-
-    pip_upgrade()  # upgrade pip to latest version in the virtualenv
-    pip_requirements()
+    bootstrap_pip()
 
     #
     # link virtualenv to rootpath/private/virtualenv

modules/pip.py

@@ -53,6 +53,15 @@ def setup_virtualenv():
             run(mkvirtualenv_cmd)
 
 
+@task
+def bootstrap_pip():
+    """
+    bootstraps pip
+    """
+    upgrade()
+    setup()
+
+
 @task
 def upgrade():
     """