From afe5befad78f1f40bdbb686bcb3ae2293256730b Mon Sep 17 00:00:00 2001
From: Dustin Swan <dustinswan@gmail.com>
Date: Tue, 3 Jan 2012 11:05:56 -0500
Subject: [PATCH] Took out vi-mode from zsh, updated vim plugins

---
 oh-my-zsh                    | 2 +-
 vim/bundle/ctrlp             | 2 +-
 vim/bundle/gundo             | 2 +-
 vim/bundle/nerdcommenter     | 2 +-
 vim/bundle/nerdtree          | 2 +-
 vim/bundle/snipmate          | 2 +-
 vim/bundle/snipmate-snippets | 2 +-
 vim/bundle/supertab          | 2 +-
 vim/bundle/syntastic         | 2 +-
 vim/bundle/tagbar            | 2 +-
 vim/bundle/tlib              | 2 +-
 vimrc                        | 2 ++
 zshrc                        | 2 +-
 13 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/oh-my-zsh b/oh-my-zsh
index 7c36ef7..8c45b73 160000
--- a/oh-my-zsh
+++ b/oh-my-zsh
@@ -1 +1 @@
-Subproject commit 7c36ef7faa65441f8eec27589f24ba9f18f8d66c
+Subproject commit 8c45b739181ba58e91e2dceaa53b08161c46b03f
diff --git a/vim/bundle/ctrlp b/vim/bundle/ctrlp
index bf03741..93637ea 160000
--- a/vim/bundle/ctrlp
+++ b/vim/bundle/ctrlp
@@ -1 +1 @@
-Subproject commit bf03741650aae253b9fbfdb5526d6a7b818a060d
+Subproject commit 93637eade600d8e0b15aa00641ea9ca328aca995
diff --git a/vim/bundle/gundo b/vim/bundle/gundo
index 12b6f67..5009271 160000
--- a/vim/bundle/gundo
+++ b/vim/bundle/gundo
@@ -1 +1 @@
-Subproject commit 12b6f67aeb892519385529b2b5cdda55cc428d9d
+Subproject commit 50092711ff831742cece76f3322674858863e3f3
diff --git a/vim/bundle/nerdcommenter b/vim/bundle/nerdcommenter
index 0fe4938..8f2af9a 160000
--- a/vim/bundle/nerdcommenter
+++ b/vim/bundle/nerdcommenter
@@ -1 +1 @@
-Subproject commit 0fe4938d22ae6bbfca054820909c9f176fbf3644
+Subproject commit 8f2af9a6d765066c5f41158beb70235245040ac7
diff --git a/vim/bundle/nerdtree b/vim/bundle/nerdtree
index 30f6bcc..205367a 160000
--- a/vim/bundle/nerdtree
+++ b/vim/bundle/nerdtree
@@ -1 +1 @@
-Subproject commit 30f6bcc30caf76bc1213f5c3d4001ba5d5fbe7fc
+Subproject commit 205367ab3f46dcc88b6ebb819a276e793a21e995
diff --git a/vim/bundle/snipmate b/vim/bundle/snipmate
index 7d11d00..7dee28b 160000
--- a/vim/bundle/snipmate
+++ b/vim/bundle/snipmate
@@ -1 +1 @@
-Subproject commit 7d11d000019f202bae7905bda838517849b1dd3b
+Subproject commit 7dee28bec1aa9eb248069d1d294cc31ec7214680
diff --git a/vim/bundle/snipmate-snippets b/vim/bundle/snipmate-snippets
index 5a37c7e..e981832 160000
--- a/vim/bundle/snipmate-snippets
+++ b/vim/bundle/snipmate-snippets
@@ -1 +1 @@
-Subproject commit 5a37c7e75299f34b8a93deb867032c7668724572
+Subproject commit e98183247638d20e195b2cd58ab2a79eefac3c24
diff --git a/vim/bundle/supertab b/vim/bundle/supertab
index 688b5d7..ac395b5 160000
--- a/vim/bundle/supertab
+++ b/vim/bundle/supertab
@@ -1 +1 @@
-Subproject commit 688b5d706c21fbc6b2db6499f3cfbdeb35309b5a
+Subproject commit ac395b57fec47f034cba151d01669d134ac7041b
diff --git a/vim/bundle/syntastic b/vim/bundle/syntastic
index d14b53e..c8dc739 160000
--- a/vim/bundle/syntastic
+++ b/vim/bundle/syntastic
@@ -1 +1 @@
-Subproject commit d14b53e903e34b967a3fc8a5f72251c02ade4e7e
+Subproject commit c8dc739e555f416ac65eab52b0bed4919ad818bb
diff --git a/vim/bundle/tagbar b/vim/bundle/tagbar
index f3973b1..81cfb3f 160000
--- a/vim/bundle/tagbar
+++ b/vim/bundle/tagbar
@@ -1 +1 @@
-Subproject commit f3973b1817ef4be3062e2c268755a63bec68740c
+Subproject commit 81cfb3f9038ca6de5716dc170212e29dfb0bf94f
diff --git a/vim/bundle/tlib b/vim/bundle/tlib
index d669489..d6c56d4 160000
--- a/vim/bundle/tlib
+++ b/vim/bundle/tlib
@@ -1 +1 @@
-Subproject commit d66948917ce7153e4a961aa5d57e1b0918e20495
+Subproject commit d6c56d4bae4f1e8908b64bc6bf0cbd6480081f49
diff --git a/vimrc b/vimrc
index 7673bf0..6bef45a 100644
--- a/vimrc
+++ b/vimrc
@@ -123,5 +123,7 @@ set list listchars=tab:»·,trail:·,eol:↪
 " fine I'll try it
 inoremap jk <Esc>
 inoremap kj <Esc>
+
 " stop hitting Esc or c-[!
 inoremap <Esc> <nop>
+nnoremap <Esc> :noh<CR><Esc>
diff --git a/zshrc b/zshrc
index a081e1d..a28e263 100644
--- a/zshrc
+++ b/zshrc
@@ -25,7 +25,7 @@ COMPLETION_WAITING_DOTS="true"
 
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git archlinux npm vi-mode node osx ruby rails3 gem)
+plugins=(git archlinux npm node osx ruby rails3 gem)
 
 source $ZSH/oh-my-zsh.sh