diff --git a/.gitmodules b/.gitmodules
index 8c67bb22..9dd41a09 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -106,3 +106,9 @@
 [submodule "vim/.vim/bundle/vim-rsi"]
 	path = vim/.vim/bundle/vim-rsi
 	url = https://github.com/tpope/vim-rsi.git
+[submodule "vim/.vim/bundle/vim-sensible"]
+	path = vim/.vim/bundle/vim-sensible
+	url = https://github.com/tpope/vim-sensible.git
+[submodule "vim/.vim/bundle/vim-unimpaired"]
+	path = vim/.vim/bundle/vim-unimpaired
+	url = https://github.com/tpope/vim-unimpaired.git
diff --git a/vim/.vim/bundle/vim-sensible b/vim/.vim/bundle/vim-sensible
new file mode 160000
index 00000000..64aa12b0
--- /dev/null
+++ b/vim/.vim/bundle/vim-sensible
@@ -0,0 +1 @@
+Subproject commit 64aa12b07b0be90a8e98bc7be1b5faac4ac873a4
diff --git a/vim/.vim/bundle/vim-unimpaired b/vim/.vim/bundle/vim-unimpaired
new file mode 160000
index 00000000..073225c9
--- /dev/null
+++ b/vim/.vim/bundle/vim-unimpaired
@@ -0,0 +1 @@
+Subproject commit 073225c993f3a925bf87f9cf28c99fdf7b62d395
diff --git a/vim/.vimrc b/vim/.vimrc
index f916bf28..75c8ec60 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -11,16 +11,15 @@ if empty($GOPATH)
   call add(g:pathogen_disabled, 'go')
 endif
 execute pathogen#infect()
-filetype plugin indent on
 
 """ mappings
 
 let mapleader=','
-" let maplocalleader='\\'
 noremap <up> <nop>
 noremap <down> <nop>
 noremap <left> <nop>
 noremap <right> <nop>
+
 nnoremap ' `
 nnoremap ` '
 " nnoremap \ ,
@@ -79,18 +78,11 @@ set encoding=utf8
 set fileencoding=utf8
 set fileformat=unix
 
-" indent/tabbing
-" set smartindent
-" set expandtab
-" set shiftwidth=2
-" set softtabstop=2
-" set tabstop=2
-
 " reading
 set linebreak
 " set ttyfast
 set list
- let &listchars = "tab:\u21e5 ,trail:\u2423,extends:\u21c9,precedes:\u21c7,nbsp:\u00b7"
+let &listchars = "tab:\u21e5 ,trail:\u2423,extends:\u21c9,precedes:\u21c7,nbsp:\u00b7"
 
 " autogroups