Cleaned up aliases a bit

zshrc

@@ -25,8 +25,9 @@ export LC_ALL=$LANG
 alias ..="cd .."
 alias gcc="gcc-4.9"
 alias g++="g++-4.9"
-alias pupgrade="python ~/.pip-upgrade 2"
+alias pupgrade2="python2.7 ~/.pip-upgrade 2"
 alias pupgrade3="python3.4 ~/.pip-upgrade 3"
+alias pupgrade="pupgrade2 && pupgrade3"
 alias cupgrade="cabal update; cabal list --simple-output --installed | awk '{print $1}' | uniq | xargs -I {} cabal install {} --reinstall"
 alias ghci="ghci -v0"
 alias psg="ps aux | grep -v grep | grep -i -e VSZ -e"
@@ -206,7 +207,6 @@ osx_upgrade_local () {
         osascript -e 'tell app "TextMate" to reload bundles'        
     fi
     pupgrade
-    pupgrade3
     cupgrade
 }
 
@@ -214,7 +214,6 @@ debian_upgrade_local (){
   sudo apt-get update && sudo apt-get -u upgrade
   sudo apt-get clean
   pupgrade
-  pupgrade3
   cupgrade
 }