Merge pull request #1595 from nevir/sublime3-support

Support for Sublime Text 3, with fallback

plugins/sublime/sublime.plugin.zsh

 # Sublime Text 2 Aliases
-#unamestr = 'uname'
 
-local _sublime_darwin_subl=/Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl
+local _sublime_darwin_paths
+_sublime_darwin_paths=(
+	"$HOME/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
+	"$HOME/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
+	"/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
+	"/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
+)
 
 if [[ $('uname') == 'Linux' ]]; then
 	if [ -f '/usr/bin/sublime_text' ]; then
@@ -9,13 +14,15 @@ if [[ $('uname') == 'Linux' ]]; then
 	else
 		st_run() { nohup /usr/bin/sublime-text $@ > /dev/null & }
 	fi
-alias st=st_run
+	alias st=st_run
+
 elif  [[ $('uname') == 'Darwin' ]]; then
-	# Check if Sublime is installed in user's home application directory
-	if [[ -a $HOME/${_sublime_darwin_subl} ]]; then
-		alias st='$HOME/${_sublime_darwin_subl}'
-	else
-		alias st='${_sublime_darwin_subl}'
-	fi
+
+	for _sublime_path in $_sublime_darwin_paths; do
+		if [[ -a $_sublime_path ]]; then
+			alias st="'$_sublime_path'"
+		fi
+	done
 fi
+
 alias stt='st .'