diff --git a/.gitignore b/.gitignore
index a0e76af..b0cb1fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .netrwhist
+vim/vim.symlink/bundle/
diff --git a/.gitmodules b/.gitmodules
index 4076d85..152a3a6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,96 +1,3 @@
-[submodule "vim/vim.symlink/bundle/vim-endwise"]
-	path = vim/vim.symlink/bundle/vim-endwise
-	url = https://github.com/tpope/vim-endwise.git
-[submodule "vim/vim.symlink/bundle/vim-rake"]
-	path = vim/vim.symlink/bundle/vim-rake
-	url = https://github.com/tpope/vim-rake.git
-[submodule "vim/vim.symlink/bundle/vim-fugitive"]
-	path = vim/vim.symlink/bundle/vim-fugitive
-	url = https://github.com/tpope/vim-fugitive.git
-[submodule "vim/vim.symlink/bundle/scss-syntax"]
-	path = vim/vim.symlink/bundle/scss-syntax
-	url = https://github.com/cakebaker/scss-syntax.vim.git
-[submodule "vim/vim.symlink/bundle/vim-ragtag"]
-	path = vim/vim.symlink/bundle/vim-ragtag
-	url = https://github.com/tpope/vim-ragtag.git
-[submodule "vim/vim.symlink/bundle/vim-jquery"]
-	path = vim/vim.symlink/bundle/vim-jquery
-	url = https://github.com/itspriddle/vim-jquery.git
-[submodule "vim/vim.symlink/bundle/vim-node"]
-	path = vim/vim.symlink/bundle/vim-node
-	url = https://github.com/mmalecki/vim-node.js.git
-[submodule "vim/vim.symlink/bundle/vim-javascript"]
-	path = vim/vim.symlink/bundle/vim-javascript
-	url = https://github.com/pangloss/vim-javascript.git
-[submodule "vim/vim.symlink/bundle/vim-markdown"]
-	path = vim/vim.symlink/bundle/vim-markdown
-	url = https://github.com/tpope/vim-markdown.git
-[submodule "vim/vim.symlink/bundle/vim-ruby"]
-	path = vim/vim.symlink/bundle/vim-ruby
-	url = https://github.com/vim-ruby/vim-ruby.git
-[submodule "vim/vim.symlink/bundle/ctrlp"]
-	path = vim/vim.symlink/bundle/ctrlp
-	url = https://github.com/kien/ctrlp.vim.git
-[submodule "vim/vim.symlink/bundle/nerdtree"]
-	path = vim/vim.symlink/bundle/nerdtree
-	url = https://github.com/scrooloose/nerdtree.git
-[submodule "vim/vim.symlink/bundle/vim-powerline"]
-	path = vim/vim.symlink/bundle/vim-powerline
-	url = https://github.com/Lokaltog/vim-powerline.git
-[submodule "vim/vim.symlink/bundle/delimitMate"]
-	path = vim/vim.symlink/bundle/delimitMate
-	url = https://github.com/Raimondi/delimitMate.git
-[submodule "vim/vim.symlink/bundle/vim-less"]
-	path = vim/vim.symlink/bundle/vim-less
-	url = https://github.com/groenewege/vim-less.git
-[submodule "vim/vim.symlink/bundle/vitality"]
-	path = vim/vim.symlink/bundle/vitality
-	url = https://github.com/sjl/vitality.vim.git
-[submodule "vim/vim.symlink/bundle/vim-colors-solarized"]
-	path = vim/vim.symlink/bundle/vim-colors-solarized
-	url = https://github.com/altercation/vim-colors-solarized.git
-[submodule "vim/vim.symlink/bundle/vim-coffee-script"]
-	path = vim/vim.symlink/bundle/vim-coffee-script
-	url = https://github.com/kchmck/vim-coffee-script.git
-[submodule "vim/vim.symlink/bundle/vim-rails"]
-	path = vim/vim.symlink/bundle/vim-rails
-	url = https://github.com/tpope/vim-rails.git
-[submodule "vim/vim.symlink/bundle/vim-pathogen"]
-	path = vim/vim.symlink/bundle/vim-pathogen
-	url = https://github.com/tpope/vim-pathogen.git
-[submodule "vim/vim.symlink/bundle/vim-jade"]
-	path = vim/vim.symlink/bundle/vim-jade
-	url = https://github.com/digitaltoad/vim-jade.git
-[submodule "vim/vim.symlink/bundle/vim-mustache"]
-	path = vim/vim.symlink/bundle/vim-mustache
-	url = git://github.com/juvenn/mustache.vim.git
-[submodule "vim/vim.symlink/bundle/vim-html5"]
-	path = vim/vim.symlink/bundle/vim-html5
-	url = https://github.com/othree/html5.vim.git
-[submodule "vim/vim.symlink/bundle/vim-matchit"]
-	path = vim/vim.symlink/bundle/vim-matchit
-	url = https://github.com/tsaleh/vim-matchit.git
-[submodule "vim/vim.symlink/bundle/vim-surround"]
-	path = vim/vim.symlink/bundle/vim-surround
-	url = https://github.com/tpope/vim-surround.git
-[submodule "vim/vim.symlink/bundle/vim-commentary"]
-	path = vim/vim.symlink/bundle/vim-commentary
-	url = https://github.com/tpope/vim-commentary.git
-[submodule "vim/vim.symlink/bundle/vim-ack"]
-	path = vim/vim.symlink/bundle/vim-ack
-	url = https://github.com/mileszs/ack.vim.git
-[submodule "vim/vim.symlink/bundle/ir-whack"]
-	path = vim/vim.symlink/bundle/ir-whack
-	url = git@github.com:nicknisi/ir-whack.git
-[submodule "vim/vim.symlink/bundle/scratch"]
-	path = vim/vim.symlink/bundle/scratch
-	url = git@github.com:duff/vim-scratch.git
-[submodule "vim/vim.symlink/bundle/syntastic"]
-	path = vim/vim.symlink/bundle/syntastic
-	url = git@github.com:scrooloose/syntastic.git
-[submodule "vim/vim.symlink/bundle/zencoding"]
-	path = vim/vim.symlink/bundle/zencoding
-	url = git@github.com:mattn/zencoding-vim.git
-[submodule "vim/vim.symlink/bundle/vimux"]
-	path = vim/vim.symlink/bundle/vimux
-	url = git@github.com:benmills/vimux.git
+[submodule "vim/vim.symlink/bundle/vundle"]
+	path = vim/vim.symlink/bundle/vundle
+	url = git@github.com:gmarik/vundle.git
diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index f8714cf..7de119f 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -18,6 +18,8 @@
     gdc = diff --cached
     # show changed files for a commit
     cf = show --pretty="format:" --name-only
+    # undo a commit
+    undo = reset --soft
 
     # stash shortcuts
     sp = stash pop
@@ -82,3 +84,5 @@
 [core]
     excludesfile = ~/.gitignore_global
     pager = less -FXRS -x2
+[rerere]
+	enabled = true
diff --git a/vim/vim.symlink/bundle/ctrlp b/vim/vim.symlink/bundle/ctrlp
deleted file mode 160000
index 5b98c74..0000000
--- a/vim/vim.symlink/bundle/ctrlp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5b98c7453f53453d4a0ebb5dc73d1f65ce676dcd
diff --git a/vim/vim.symlink/bundle/delimitMate b/vim/vim.symlink/bundle/delimitMate
deleted file mode 160000
index 0326b7c..0000000
--- a/vim/vim.symlink/bundle/delimitMate
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0326b7c14a8acb7e4185df1f6033d87bab9ff152
diff --git a/vim/vim.symlink/bundle/ir-whack b/vim/vim.symlink/bundle/ir-whack
deleted file mode 160000
index 8ce7dea..0000000
--- a/vim/vim.symlink/bundle/ir-whack
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8ce7dea6bd8b0a5a9040992adbe110b8d53da384
diff --git a/vim/vim.symlink/bundle/nerdtree b/vim/vim.symlink/bundle/nerdtree
deleted file mode 160000
index 1dc3891..0000000
--- a/vim/vim.symlink/bundle/nerdtree
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1dc3891f960c25aa3f23aa46f5afc8d41db38233
diff --git a/vim/vim.symlink/bundle/scratch b/vim/vim.symlink/bundle/scratch
deleted file mode 160000
index 90c2bc4..0000000
--- a/vim/vim.symlink/bundle/scratch
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 90c2bc4bfe01151aa5c71d9cb243b05bc105ae01
diff --git a/vim/vim.symlink/bundle/scss-syntax b/vim/vim.symlink/bundle/scss-syntax
deleted file mode 160000
index c530623..0000000
--- a/vim/vim.symlink/bundle/scss-syntax
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c53062315760bd02e8a6494283142c9b47e8ec43
diff --git a/vim/vim.symlink/bundle/syntastic b/vim/vim.symlink/bundle/syntastic
deleted file mode 160000
index 2e7d733..0000000
--- a/vim/vim.symlink/bundle/syntastic
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2e7d73305b70a456abb20b1754e094cccfefa3d3
diff --git a/vim/vim.symlink/bundle/vim-ack b/vim/vim.symlink/bundle/vim-ack
deleted file mode 160000
index e93f693..0000000
--- a/vim/vim.symlink/bundle/vim-ack
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e93f693fd2a9940d6421bf9e4ddd1f535994eaa5
diff --git a/vim/vim.symlink/bundle/vim-coffee-script b/vim/vim.symlink/bundle/vim-coffee-script
deleted file mode 160000
index 089506e..0000000
--- a/vim/vim.symlink/bundle/vim-coffee-script
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 089506ed89da1849485fdfcca002a42111759fab
diff --git a/vim/vim.symlink/bundle/vim-colors-solarized b/vim/vim.symlink/bundle/vim-colors-solarized
deleted file mode 160000
index 528a59f..0000000
--- a/vim/vim.symlink/bundle/vim-colors-solarized
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 528a59f26d12278698bb946f8fb82a63711eec21
diff --git a/vim/vim.symlink/bundle/vim-commentary b/vim/vim.symlink/bundle/vim-commentary
deleted file mode 160000
index dc349bb..0000000
--- a/vim/vim.symlink/bundle/vim-commentary
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit dc349bb7d30f713d770fc1fa0fe209e6aab82dc8
diff --git a/vim/vim.symlink/bundle/vim-endwise b/vim/vim.symlink/bundle/vim-endwise
deleted file mode 160000
index a45d4a6..0000000
--- a/vim/vim.symlink/bundle/vim-endwise
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a45d4a6221acbc5ab1e7138980b9bf5074c414f6
diff --git a/vim/vim.symlink/bundle/vim-fugitive b/vim/vim.symlink/bundle/vim-fugitive
deleted file mode 160000
index 6f380fa..0000000
--- a/vim/vim.symlink/bundle/vim-fugitive
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6f380fa8c6daf301fc5e8a5d650c54be24e5b2c9
diff --git a/vim/vim.symlink/bundle/vim-html5 b/vim/vim.symlink/bundle/vim-html5
deleted file mode 160000
index 020d440..0000000
--- a/vim/vim.symlink/bundle/vim-html5
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 020d440eeb2a65800b1a0087bb8a7196b6cec4db
diff --git a/vim/vim.symlink/bundle/vim-jade b/vim/vim.symlink/bundle/vim-jade
deleted file mode 160000
index 35ce7b3..0000000
--- a/vim/vim.symlink/bundle/vim-jade
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 35ce7b3f4abaa18c3e62cacf75a8e925784f5949
diff --git a/vim/vim.symlink/bundle/vim-javascript b/vim/vim.symlink/bundle/vim-javascript
deleted file mode 160000
index 395f890..0000000
--- a/vim/vim.symlink/bundle/vim-javascript
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 395f8901b34cc871c9576886938a6efda0eb7268
diff --git a/vim/vim.symlink/bundle/vim-jquery b/vim/vim.symlink/bundle/vim-jquery
deleted file mode 160000
index 61890d8..0000000
--- a/vim/vim.symlink/bundle/vim-jquery
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 61890d8e5ba8a873526fb91c6484aa445cc20b56
diff --git a/vim/vim.symlink/bundle/vim-less b/vim/vim.symlink/bundle/vim-less
deleted file mode 160000
index 0223dcd..0000000
--- a/vim/vim.symlink/bundle/vim-less
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0223dcdf0f4d3cb2b811a10c3673c0832b337415
diff --git a/vim/vim.symlink/bundle/vim-markdown b/vim/vim.symlink/bundle/vim-markdown
deleted file mode 160000
index 9407dae..0000000
--- a/vim/vim.symlink/bundle/vim-markdown
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9407dae6609ef9751acc8eedc30f52999018eb47
diff --git a/vim/vim.symlink/bundle/vim-matchit b/vim/vim.symlink/bundle/vim-matchit
deleted file mode 160000
index 8f8665e..0000000
--- a/vim/vim.symlink/bundle/vim-matchit
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8f8665e04fe377a25bbed29abf13ea66a1a0c129
diff --git a/vim/vim.symlink/bundle/vim-mustache b/vim/vim.symlink/bundle/vim-mustache
deleted file mode 160000
index c3ee501..0000000
--- a/vim/vim.symlink/bundle/vim-mustache
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c3ee501a2dcabb8f145169b7a5df7ff74093104e
diff --git a/vim/vim.symlink/bundle/vim-node b/vim/vim.symlink/bundle/vim-node
deleted file mode 160000
index 0b5146f..0000000
--- a/vim/vim.symlink/bundle/vim-node
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0b5146fa9bd69cba9ce8690c164271a726e3b7b8
diff --git a/vim/vim.symlink/bundle/vim-pathogen b/vim/vim.symlink/bundle/vim-pathogen
deleted file mode 160000
index 49e6d62..0000000
--- a/vim/vim.symlink/bundle/vim-pathogen
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 49e6d62fb1712aa12161193fc55c6af8f27b6131
diff --git a/vim/vim.symlink/bundle/vim-powerline b/vim/vim.symlink/bundle/vim-powerline
deleted file mode 160000
index 99277d9..0000000
--- a/vim/vim.symlink/bundle/vim-powerline
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 99277d9eed97a59cacc1db8c1dece2bcfd96d877
diff --git a/vim/vim.symlink/bundle/vim-ragtag b/vim/vim.symlink/bundle/vim-ragtag
deleted file mode 160000
index 2f639ea..0000000
--- a/vim/vim.symlink/bundle/vim-ragtag
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2f639ea61ab037e7862228d54a1c292f59c2385f
diff --git a/vim/vim.symlink/bundle/vim-rails b/vim/vim.symlink/bundle/vim-rails
deleted file mode 160000
index 7878d04..0000000
--- a/vim/vim.symlink/bundle/vim-rails
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7878d048993edc1c97360b9f5f534867a2f2625f
diff --git a/vim/vim.symlink/bundle/vim-rake b/vim/vim.symlink/bundle/vim-rake
deleted file mode 160000
index fd4cadb..0000000
--- a/vim/vim.symlink/bundle/vim-rake
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fd4cadbd944badba8ebf6b324aac367e78059461
diff --git a/vim/vim.symlink/bundle/vim-ruby b/vim/vim.symlink/bundle/vim-ruby
deleted file mode 160000
index 4245457..0000000
--- a/vim/vim.symlink/bundle/vim-ruby
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 42454576554310aae282a0becb0c0b3d69371148
diff --git a/vim/vim.symlink/bundle/vim-surround b/vim/vim.symlink/bundle/vim-surround
deleted file mode 160000
index 1a73f60..0000000
--- a/vim/vim.symlink/bundle/vim-surround
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1a73f607f8f5477d6942df2eb6e7245c4864f4d3
diff --git a/vim/vim.symlink/bundle/vimux b/vim/vim.symlink/bundle/vimux
deleted file mode 160000
index d6d88a4..0000000
--- a/vim/vim.symlink/bundle/vimux
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d6d88a4fce39f856d46b86e3fcd46f5dbbdd9035
diff --git a/vim/vim.symlink/bundle/vitality b/vim/vim.symlink/bundle/vitality
deleted file mode 160000
index dfbdc2a..0000000
--- a/vim/vim.symlink/bundle/vitality
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit dfbdc2a086a71fdca7fd63a3f9e4cca0863e49af
diff --git a/vim/vim.symlink/bundle/vundle b/vim/vim.symlink/bundle/vundle
new file mode 160000
index 0000000..2a494ff
--- /dev/null
+++ b/vim/vim.symlink/bundle/vundle
@@ -0,0 +1 @@
+Subproject commit 2a494ff00fc10ed5725fbb99ec267ec2c9917817
diff --git a/vim/vim.symlink/bundle/zencoding b/vim/vim.symlink/bundle/zencoding
deleted file mode 160000
index f6c5a8c..0000000
--- a/vim/vim.symlink/bundle/zencoding
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f6c5a8c717a7cc4385e7dc95d4d62bca540e946a
diff --git a/vim/vimrc.symlink b/vim/vimrc.symlink
index 1e1bad7..955c419 100644
--- a/vim/vimrc.symlink
+++ b/vim/vimrc.symlink
@@ -1,10 +1,39 @@
 " vim settings
 
-" Pathogen
-" loads all plugins places in the ~/.vim/bundle directory
-runtime bundle/vim-pathogen/autoload/pathogen.vim
-let g:pathogen_disabled=[]
-call pathogen#infect()
+filetype off
+set rtp+=~/.vim/bundle/vundle/
+call vundle#rc()
+
+" let vundle manage vundle
+Bundle 'gmarik/vundle'
+
+" my vim plugins
+Bundle 'kien/ctrlp.vim'
+Bundle 'scrooloose/nerdtree'
+Bundle 'mileszs/ack.vim'
+Bundle 'scrooloose/syntastic'
+Bundle 'Raimondi/delimitMate'
+Bundle 'tpope/vim-commentary'
+Bundle 'tpope/vim-endwise'
+Bundle 'tpope/vim-fugitive'
+Bundle 'othree/html5.vim'
+Bundle 'pangloss/vim-javascript'
+Bundle 'itspriddle/vim-jquery'
+Bundle 'tpope/vim-markdown'
+Bundle 'mmalecki/vim-node.js'
+Bundle 'Lokaltog/vim-powerline'
+Bundle 'tpope/vim-ragtag'
+Bundle 'tpope/vim-surround'
+Bundle 'sjl/vitality.vim'
+Bundle 'duff/vim-scratch'
+Bundle 'cakebaker/scss-syntax.vim'
+Bundle 'kchmck/vim-coffee-script'
+Bundle 'groenewege/vim-less'
+Bundle 'nono/vim-handlebars'
+Bundle 'tsaleh/vim-matchit'
+
+filetype plugin indent on
+
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " => General
@@ -40,7 +69,7 @@ set softtabstop=4
 set ttyfast
 
 " allow matching of if/end, etc. with %
-runtime macros/matchit.vim
+" runtime macros/matchit.vim
 
 " highlight conflicts
 match ErrorMsg '^\(<\|=\|>\)\{7\}\([^=].\+\)\?$'
@@ -103,10 +132,10 @@ set showmatch " show matching braces
 set mat=2 " how many tenths of a second to blink
 
 " switch to line when editing and block when not
-let cursor_to_bar   = "\<Esc>]50;CursorShape=1\x7"
-let cursor_to_block = "\<Esc>]50;CursorShape=0\x7"
-let &t_SI = cursor_to_bar
-let &t_EI = cursor_to_block
+" let cursor_to_bar   = "\<Esc>]50;CursorShape=1\x7"
+" let cursor_to_block = "\<Esc>]50;CursorShape=0\x7"
+" let &t_SI = cursor_to_bar
+" let &t_EI = cursor_to_block
 
 " error bells
 set noerrorbells
@@ -163,7 +192,7 @@ set laststatus=2 " show the satus line all the time
 " Additional, plugin-specific mappings are located under
 " the plugins section
 "
-nnoremap K :q<cr>
+" nnoremap K :q<cr>
 
 " remap esc and disable to force learning
 inoremap jk <esc>