diff --git a/.gitignore b/.gitignore
index 51a5ee6c3..dc97fb6b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,5 @@ custom/*
 !custom/example
 !custom/example.zsh
 *.swp
-!custom/example.zshcache
+*.un~
 cache/
diff --git a/plugins/vim-override/vim-override.plugin.zsh b/plugins/vim-override/vim-override.plugin.zsh
new file mode 100644
index 000000000..80ac92dbe
--- /dev/null
+++ b/plugins/vim-override/vim-override.plugin.zsh
@@ -0,0 +1,10 @@
+# try to replace OSX's default vim by MacVim's version
+RECENTVIM=`find /usr/local/Cellar/macvim -name Vim`
+
+# if mode indicator wasn't setup by theme, define default
+if [[ "$OSTYPE" == darwin* && -e $RECENTVIM ]]; then
+	echo "Redirecionando vim..."
+  alias vim="$RECENTVIM"
+else
+	echo "deu zica criando alias"
+fi
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 44baa1c0b..3087ad42d 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -15,7 +15,7 @@ ZSH_THEME="jreese"
 # CASE_SENSITIVE="true"
 
 # Comment this out to disable bi-weekly auto-update checks
-# DISABLE_AUTO_UPDATE="true"
+DISABLE_AUTO_UPDATE="true"
 
 # Uncomment to change how many often would you like to wait before auto-updates occur? (in days)
 # export UPDATE_ZSH_DAYS=13
@@ -32,7 +32,7 @@ ZSH_THEME="jreese"
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git osx python virtualenvwrapper)
+plugins=(git osx python virtualenvwrapper vim-override)
 
 source $ZSH/oh-my-zsh.sh