Merge branch 'gsemet_push_common_aliases' of https://github.com/Stibbons/oh-my-zsh into gsemet_push_common_aliases

Conflicts:
	plugins/common-aliases/common-aliases.plugin.zsh

plugins/common-aliases/common-aliases.plugin.zsh

@@ -1,5 +1,8 @@
-#Aliases
-##ls, the common ones I use a lot shortened for rapid fire usage
+# Advanced Aliases.
+# Use with caution
+#
+
+# ls, the common ones I use a lot shortened for rapid fire usage
 alias ls='ls --color' #I like color
 alias l='ls -lFh'     #size,show type,human readable
 alias la='ls -lAFh'   #long list,show almost all,show type,human readable
@@ -11,14 +14,14 @@ alias lS='ls -1FSsh'
 alias lart='ls -1Fcart'
 alias lrt='ls -1Fcrt'
 
-alias zshrc='vim ~/.zshrc'
+alias zshrc='vim ~/.zshrc' # Quick access to the ~/.zshrc file
 
 alias grep='grep --color'
 alias sgrep='grep -R -n -H -C 5'
 
 alias t='tail -f'
 
-# cd, because typing the backslash is A LOT of work!!
+# because typing 'cd' is A LOT of work!!
 alias ..='cd ../'
 alias ...='cd ../../'
 alias ....='cd ../../../'
@@ -86,5 +89,6 @@ if [ ${ZSH_VERSION//\./} -ge 420 ]; then
   alias -s ace="unace l"
 fi
 
+# Make zsh know about hosts already accessed by SSH
 zstyle -e ':completion:*:(ssh|scp|sftp|rsh|rsync):hosts' hosts 'reply=(${=${${(f)"$(cat {/etc/ssh_,~/.ssh/known_}hosts(|2)(N) /dev/null)"}%%[# ]*}//,/ })'