Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh

Conflicts:
	tools/install.sh

tools/check_for_upgrade.sh

@@ -32,9 +32,10 @@ then
       echo "[Oh My Zsh] Would you like to check for updates?"
       echo "Type Y to update oh-my-zsh: \c"
       read line
-      if [ "$line" = Y ] || [ "$line" = y ]
-      then
+      if [ "$line" = Y ] || [ "$line" = y ]; then
         _upgrade_zsh
+      else
+        _update_zsh_update
       fi
     fi
   fi

tools/install.sh

@@ -5,14 +5,10 @@ then
 fi
 
 echo "\033[0;34mCloning Oh My Zsh...\033[0m"
-which git > /dev/null
-if [[ $? -eq 0 ]]; then
-  /usr/bin/env git clone https://github.com/thenickperson/oh-my-zsh.git ~/.oh-my-zsh
-  /usr/bin/env git remote add upstream https://github.com/robbyrussell/oh-my-zsh.git
-else
+hash git >/dev/null && /usr/bin/env git clone https://github.com/thenickperson/oh-my-zsh.git ~/.oh-my-zsh || {
   echo "git not installed"
   exit
-fi
+}
 
 echo "\033[0;34mLooking for an existing zsh config...\033[0m"
 if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]