diff --git a/.vim/bundle/YouCompleteMe b/.vim/bundle/YouCompleteMe
index 7cc399a..d2fe03f 160000
--- a/.vim/bundle/YouCompleteMe
+++ b/.vim/bundle/YouCompleteMe
@@ -1 +1 @@
-Subproject commit 7cc399a017a0f20c230a50a4f05d58ab7ef9dca4
+Subproject commit d2fe03f0724d36ed75867e66150074930e2f3f2e
diff --git a/.vim/bundle/vim-airline b/.vim/bundle/vim-airline
index ccb00be..1f6b936 160000
--- a/.vim/bundle/vim-airline
+++ b/.vim/bundle/vim-airline
@@ -1 +1 @@
-Subproject commit ccb00be717d36276514ed660f6f6b6d3413b1fad
+Subproject commit 1f6b936dd8454262cfd4effe42210f049891cff6
diff --git a/.vim/bundle/vim-bufferline b/.vim/bundle/vim-bufferline
index f501353..526e4e2 160000
--- a/.vim/bundle/vim-bufferline
+++ b/.vim/bundle/vim-bufferline
@@ -1 +1 @@
-Subproject commit f501353aeafdfd9137b5f7847d598b86065be133
+Subproject commit 526e4e2c58d317f88ae84298922c2915bd0b1ecb
diff --git a/.vim/bundle/vim-coffee-script b/.vim/bundle/vim-coffee-script
index 83c06f7..d944c79 160000
--- a/.vim/bundle/vim-coffee-script
+++ b/.vim/bundle/vim-coffee-script
@@ -1 +1 @@
-Subproject commit 83c06f7a351b9140988bfe6d3e651a63d3c504c0
+Subproject commit d944c79848a29ac58cc1e435e81a795bb6d16c18
diff --git a/.vim/bundle/vim-gocode b/.vim/bundle/vim-gocode
index 7b07ccd..1d6e948 160000
--- a/.vim/bundle/vim-gocode
+++ b/.vim/bundle/vim-gocode
@@ -1 +1 @@
-Subproject commit 7b07ccdc64afb8a4eced064901b63dbfca1e4a64
+Subproject commit 1d6e94805679eeb7c27391e6eebc8067ff1d543a
diff --git a/.vimrc b/.vimrc
index 86a0769..090cc29 100644
--- a/.vimrc
+++ b/.vimrc
@@ -211,6 +211,7 @@ let g:airline#extensions#whitespace#enabled = 0
 let g:ctrlp_map = ',t'
 let g:ctrlp_cmd = 'CtrlP'
 let g:ctrlp_working_path_mode = 'ra'
+let g:ctrlp_match_window = 'bottom,order:ttb,min:1,max:15'
 
 
 " ** STATUSLINE **
@@ -445,10 +446,10 @@ nnoremap <Leader>ac :Ack
 nnoremap <Leader>hh :A<CR>
 " CommandT is useful, but if I'm juggling lots of buffers, limit it to another
 " one I have open (instead of standard <Leader>t).
-nnoremap <silent> <Leader>o :CommandTBuffer<CR>
+nnoremap <silent> <Leader>o :CtrlPBuffer<CR>
 nnoremap <Leader>j <C-^>
-nnoremap <Leader>p  :PTW 
-nnoremap <Leader>lp  :LustyJugglePrevious<CR>
+"nnoremap <Leader>p  :PTW 
+nnoremap <Leader>p  :LustyJugglePrevious<CR>
 
 " ** EXTRA INCLUDES **
 "