Merge pull request #443 from alex/no-easy-install

easy_install is awful, don't use it
diff --git a/.travis.yml b/.travis.yml
index 92ee221..d28fef5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@
     - ./.travis/install.sh
 
 script:
-    - if [[ "$(uname -s)" == "Darwin" ]]; then eval "$(pyenv init -)";fi && source ~/.venv/bin/activate && tox -e $TOX_ENV
+    - if [[ "$(uname -s)" == "Darwin" ]]; then eval "$(pyenv init -)"; fi && source ~/.venv/bin/activate && tox -e $TOX_ENV
 
 after_success:
     - coveralls
diff --git a/.travis/install.sh b/.travis/install.sh
index d25ed94..8d6840f 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -15,12 +15,14 @@
     if which pyenv > /dev/null; then eval "$(pyenv init -)"; fi
     case "${TOX_ENV}" in
         py26)
-            sudo easy_install pip
+            curl -O https://raw.github.com/pypa/pip/master/contrib/get-pip.py
+            sudo python get-pip.py
             sudo pip install setuptools --no-use-wheel --upgrade
             sudo pip install virtualenv
             ;;
         py27)
-            sudo easy_install pip
+            curl -O https://raw.github.com/pypa/pip/master/contrib/get-pip.py
+            sudo python get-pip.py
             sudo pip install setuptools --no-use-wheel --upgrade
             sudo pip install virtualenv
             ;;