--- a/vim/vimfiles/plugin/ctrlp.vim	Wed Jan 04 19:34:22 2012 -0600
+++ b/vim/vimfiles/plugin/ctrlp.vim	Wed Jan 04 19:37:22 2012 -0600
@@ -11,21 +11,22 @@
 let [g:loaded_ctrlp, g:ctrlp_lines, g:ctrlp_allfiles] = [1, [], []]
 
 if !exists('g:ctrlp_map') | let g:ctrlp_map = '<c-p>' | en
+if !exists('g:ctrlp_cmd') | let g:ctrlp_cmd = 'CtrlP' | en
 
-com! -na=? -comp=custom,ctrlp#cpl CtrlP cal ctrlp#init(0, <q-args>)
+com! -n=? -com=custom,ctrlp#cpl CtrlP cal ctrlp#init(0, <q-args>)
 
 com! CtrlPBuffer   cal ctrlp#init(1)
 com! CtrlPMRUFiles cal ctrlp#init(2)
 
-com! ClearCtrlPCache cal ctrlp#clr()
+com! ClearCtrlPCache     cal ctrlp#clr()
 com! ClearAllCtrlPCaches cal ctrlp#clra()
-com! ResetCtrlP cal ctrlp#reset()
+com! ResetCtrlP          cal ctrlp#reset()
 
 com! CtrlPCurWD   cal ctrlp#init(0, 0)
 com! CtrlPCurFile cal ctrlp#init(0, 1)
 com! CtrlPRoot    cal ctrlp#init(0, 2)
 
-exe 'nn <silent>' g:ctrlp_map ':<c-u>CtrlP<cr>'
+exe 'nn <silent>' g:ctrlp_map ':<c-u>'.g:ctrlp_cmd.'<cr>'
 
 cal ctrlp#mrufiles#init()
 
@@ -40,5 +41,12 @@
 en
 
 if index(g:ctrlp_extensions, 'dir') >= 0
-	let g:ctrlp_alldirs = [] | com! CtrlPDir cal ctrlp#init(ctrlp#dir#id())
+	let g:ctrlp_alldirs = []
+	com! -n=? -com=custom,ctrlp#cpl CtrlPDir
+		\ cal ctrlp#init(ctrlp#dir#id(), <q-args>)
 en
+
+if index(g:ctrlp_extensions, 'buffertag') >= 0
+	let g:ctrlp_buftags = {}
+	com! CtrlPBufTag cal ctrlp#init(ctrlp#buffertag#id())
+en