diff --git a/.vim/bundle/Gundo b/.vim/bundle/Gundo
new file mode 160000
index 0000000..ee32891
--- /dev/null
+++ b/.vim/bundle/Gundo
@@ -0,0 +1 @@
+Subproject commit ee32891c126b06d70d92b6ccefe4ff9a2c4fd7d6
diff --git a/.vim/bundle/ShowMarks b/.vim/bundle/ShowMarks
new file mode 160000
index 0000000..ef22709
--- /dev/null
+++ b/.vim/bundle/ShowMarks
@@ -0,0 +1 @@
+Subproject commit ef22709d8ebba137819ab0e60db5463b480934cd
diff --git a/.vim/bundle/vundle b/.vim/bundle/vundle
new file mode 160000
index 0000000..03ed2bd
--- /dev/null
+++ b/.vim/bundle/vundle
@@ -0,0 +1 @@
+Subproject commit 03ed2bd39e37c5ff035c05197af81558eb5d8a89
diff --git a/.vimrc b/.vimrc
index 0185607..1098d1e 100644
--- a/.vimrc
+++ b/.vimrc
@@ -171,7 +171,7 @@ set popt+=syntax:y
 
 " Enable filetype settings {{{2
 if has("eval")
-  filetype on
+  filetype off " Off for vundle
   filetype plugin on
   filetype indent on
 endif
@@ -619,6 +619,10 @@ nmap <C-h> <C-w>h
 nmap <C-j> <C-w>j
 nmap <C-k> <C-w>k
 nmap <C-l> <C-w>l
+nmap <C-Left> <C-w>h
+nmap <C-Down> <C-w>j
+nmap <C-Up> <C-w>k
+nmap <C-Right> <C-w>l
 
 " Move through buffers instead of tabs with gt/gT {{{2
 "nmap gT :bprev<CR>
@@ -697,6 +701,8 @@ noremap <Leader>J :s/\%#\(.*\)\n\(.*\)/\2\1<CR>
 
 " In normal mode, jj or jl escapes {{{2
 inoremap jj <Esc>
+inoremap hh <Esc>
+"inoremap kk <Esc> " Messes up final-k fuf searches
 inoremap jl <Esc>
 
 " Kill line like emacs {{{2
@@ -1063,15 +1069,16 @@ if has("eval")
   endif
 
   let g:showmarks_include="abcdefghijklmnopqrstuvwxyz"
+  "let g:showmarks_include="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
 
   if has("autocmd")
     fun! <SID>FixShowmarksColours()
-      if has('gui') 
-        hi ShowMarksHLl gui=bold guifg=#a0a0e0 guibg=#2e2e2e 
-        hi ShowMarksHLu gui=none guifg=#a0a0e0 guibg=#2e2e2e 
-        hi ShowMarksHLo gui=none guifg=#a0a0e0 guibg=#2e2e2e 
-        hi ShowMarksHLm gui=none guifg=#a0a0e0 guibg=#2e2e2e 
-        hi SignColumn   gui=none guifg=#f0f0f8 guibg=#2e2e2e 
+      if has('gui')
+        hi ShowMarksHLl gui=bold guifg=#a0a0e0 guibg=#2e2e2e
+        hi ShowMarksHLu gui=none guifg=#a0a0e0 guibg=#2e2e2e
+        hi ShowMarksHLo gui=none guifg=#a0a0e0 guibg=#2e2e2e
+        hi ShowMarksHLm gui=none guifg=#a0a0e0 guibg=#2e2e2e
+        hi SignColumn   gui=none guifg=#f0f0f8 guibg=#2e2e2e
       endif
     endfun
     if v:version >= 700
@@ -1115,6 +1122,22 @@ if has("eval")
   endif
 endif
 
+" Vundle
+set rtp+=~/.vim/bundle/vundle
+call vundle#rc()
+Bundle 'gmarik/vundle'
+Bundle 'vim-scripts/ShowMarks'
+
+filetype plugin indent on
+" Brief help
+" :BundleList          - list configured bundles
+" :BundleInstall(!)    - install(update) bundles
+" :BundleSearch(!) foo - search(or refresh cache first) for foo
+" :BundleClean(!)      - confirm(or auto-approve) removal of unused bundles
+"
+" see :h vundle for more details or wiki for FAQ
+" NOTE: comments after Bundle command are not allowed..
+
 " }}}1
 
 "-----------------------------------------------------------------------