diff --git a/.gitignore b/.gitignore
index 2e8db7341..c7ad5ca6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ custom/*
 !custom/example.zsh
 cache
 *.swp
+*.un~
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 8993c2815..02e0e6cb1 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 weekly auto-update checks
-# DISABLE_AUTO_UPDATE="true"
+DISABLE_AUTO_UPDATE="true"
 
 # Uncomment following line if you want to disable colors in ls
 # DISABLE_LS_COLORS="true"
@@ -29,7 +29,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