diff --git a/.gitmodules b/.gitmodules
index 05b56a2..d806c06 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -109,3 +109,6 @@
 [submodule "vim/snippets"]
 	path = vim/snippets
 	url = https://github.com/scrooloose/snipmate-snippets.git
+[submodule "vim/bundle/wincent-Command-T"]
+	path = vim/bundle/wincent-Command-T
+	url = https://github.com/wincent/Command-T
diff --git a/vim/bundle/wincent-Command-T b/vim/bundle/wincent-Command-T
new file mode 160000
index 0000000..e9a861b
--- /dev/null
+++ b/vim/bundle/wincent-Command-T
@@ -0,0 +1 @@
+Subproject commit e9a861b34674608ffa70e26063674245cd4e0927
diff --git a/vimrc b/vimrc
index de9a147..2ff4adc 100644
--- a/vimrc
+++ b/vimrc
@@ -237,10 +237,6 @@ imap <silent> <C-K> <%=   %><Esc>3hi
 " create <%= foo %> erb tags using Ctrl-j in edit mode
 imap <silent> <C-J> <%  %><Esc>2hi
 
-
-" hit \t to run current test
-nmap <silent> <Leader>t :RunRubyFocusedContext<CR>
-
 " set up automatic ctags
 let Tlist_Ctags_Cmd='/opt/local/bin/ctags'
 
@@ -414,3 +410,10 @@ let g:neocomplcache_enable_camel_case_completion = 1
 let g:neocomplcache_enable_underbar_completion = 1
 let g:neocomplcache_min_syntax_length = 5
 inoremap <expr><D-Space>  pumvisible() ? "\<C-n>" : "\<TAB>" 
+
+
+" Command-T
+" Mapped to ,t
+let g:CommandTMaxHeight = 5
+let g:CommandTMatchWindowReverse = 1
+nmap ,t :CommandT<CR>