Merge remote-tracking branch 'cadusk/master'

Conflicts:
	lib/aliases.zsh
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	tools/install.sh

lib/aliases.zsh

@@ -34,6 +34,8 @@ else
     alias history='fc -l 1'
 fi
 
+alias afind='ack-grep -il'
+
 # Enable ls colors
 LS_OPTIONS='-hF'
 if [ "$DISABLE_LS_COLORS" != "true" ]
@@ -47,8 +49,13 @@ alias lsa='ls -lah'
 alias l='ls -lah'
 alias ll='ls -lh'
 alias la='ls -lAh'
-alias l=la
 alias sl=ls # often screw this up
 
-alias afind='ack-grep -il'
-
+alias gita='git add -A'
+alias gitl='git l'
+alias gitw='git who'
+alias gitt='git tags'
+# Aliases
+alias ta='tmux attach -t'
+alias tl='tmux list-session'
+alias ts='tmux new-session'