diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index cec79f78f..5a88f8d60 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -40,3 +40,7 @@ alias l=la
 alias sl=ls # often screw this up
 
 alias afind='ack-grep -il'
+
+# Git aliases
+alias gits='git st'
+alias gitk='gitk --all &'
diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index 626c41f3d..fcc1024fa 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -46,7 +46,7 @@ if which tmux &> /dev/null
 	fi
 
 	# Set the correct local config file to use.
-    if [[ "$ZSH_TMUX_ITERM2" == "false" ]] && [[ -f $HOME/.tmux.conf || -h $HOME/.tmux.conf ]]
+    if [[ "$ZSH_TMUX_ITERM2" == "false" ]] && [[ -f $HOME/.tmux.conf ]]
 	then
 		#use this when they have a ~/.tmux.conf
 		export _ZSH_TMUX_FIXED_CONFIG="$zsh_tmux_plugin_path/tmux.extra.conf"
diff --git a/templates/zshrc-linux.zsh b/templates/zshrc-linux.zsh
index 845c90e53..0322621c1 100644
--- a/templates/zshrc-linux.zsh
+++ b/templates/zshrc-linux.zsh
@@ -43,6 +43,7 @@ if [ -z "$LC_ALL" ]; then export LC_ALL=en_US.UTF-8; fi
 if [ -z "$LANG" ]; then export LANG=en_US.UTF-8; fi
 
 if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi
+if [ -e $HOME/.cabal/bin ]; then export PATH="$HOME/.cabal/bin:$PATH"; fi
 unsetopt correctall
 
 [ "$TERM" = "xterm" ] && TERM="xterm-256color"
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 887d6a3f4..9369ab3b4 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -14,7 +14,7 @@ ZSH_THEME="stibbons"
 # Set to this to use case-sensitive completion
 # CASE_SENSITIVE="true"
 
-# Uncomment this to disable bi-weekly auto-update checks
+# Comment this out to disable weekly auto-update checks
 DISABLE_AUTO_UPDATE="true"
 
 # Uncomment to change how often before auto-updates occur? (in days)