diff --git a/zsh/aliases b/zsh/aliases
index 32f932f..9576ba5 100644
--- a/zsh/aliases
+++ b/zsh/aliases
@@ -84,6 +84,7 @@ alias gh="source ~/.githelpers && show_git_head"
 alias gl='gll -25'
 alias gll="source ~/.githelpers && pretty_git_log"
 alias gla='gll --all'
+alias gm='git merge'
 alias gmff='git merge --ff-only'
 alias gmtheirs='git merge -Xtheirs'
 alias gp='git push'
diff --git a/zshrc b/zshrc
index 1c18860..9f2ec26 100644
--- a/zshrc
+++ b/zshrc
@@ -27,7 +27,7 @@ export TERM=xterm-256color
 export EDITOR=vi
 
 # Grep tweaks
-export GREP_OPTIONS="-nRi --color --exclude-dir=tmp" # --exclude-dir=public --exclude-dir=log --exclude-dir=vendor/assets --exclude-dir=fonts --exclude-dir=images --exclude-dir=coverage --exclude-dir=rdoc"
+export GREP_OPTIONS="-nRi --color --exclude-dir=tmp --exclude-dir=public --exclude-dir=log" # --exclude-dir=vendor/assets --exclude-dir=fonts --exclude-dir=images --exclude-dir=coverage --exclude-dir=rdoc"
 
 # Save a ton of history
 export HISTSIZE=20000