diff --git a/vim/settings/ctrlp.vim b/vim/settings/ctrlp.vim
index 2818bfe..e8567f1 100644
--- a/vim/settings/ctrlp.vim
+++ b/vim/settings/ctrlp.vim
@@ -11,8 +11,8 @@ let g:ctrlp_map = ',t'
 nnoremap <silent> ,t :CtrlP<CR>
 
 " Additional mapping for buffer search
-nnoremap <silent> ,b :CloseSingleConque<CR>:CtrlPBuffer<cr>
-nnoremap <silent> <C-b> :CloseSingleConque<CR>:CtrlPBuffer<cr>
+nnoremap <silent> ,b :CtrlPBuffer<cr>
+nnoremap <silent> <C-b> :CtrlPBuffer<cr>
 
 " Cmd-Shift-P to clear the cache
 nnoremap <silent> <D-P> :ClearCtrlPCache<cr>
@@ -20,21 +20,21 @@ nnoremap <silent> <D-P> :ClearCtrlPCache<cr>
 " Idea from : http://www.charlietanksley.net/blog/blog/2011/10/18/vim-navigation-with-lustyexplorer-and-lustyjuggler/
 " Open CtrlP starting from a particular path, making it much
 " more likely to find the correct thing first. mnemonic 'jump to [something]'
-map ,ja :CloseSingleConque<CR>:CtrlP app/assets<CR>
-map ,jm :CloseSingleConque<CR>:CtrlP app/models<CR>
-map ,jc :CloseSingleConque<CR>:CtrlP app/controllers<CR>
-map ,jv :CloseSingleConque<CR>:CtrlP app/views<CR>
-map ,jh :CloseSingleConque<CR>:CtrlP app/helpers<CR>
-map ,jl :CloseSingleConque<CR>:CtrlP lib<CR>
-map ,jp :CloseSingleConque<CR>:CtrlP public<CR>
-map ,js :CloseSingleConque<CR>:CtrlP spec<CR>
-map ,jf :CloseSingleConque<CR>:CtrlP fast_spec<CR>
-map ,jd :CloseSingleConque<CR>:CtrlP db<CR>
-map ,jC :CloseSingleConque<CR>:CtrlP config<CR>
-map ,jV :CloseSingleConque<CR>:CtrlP vendor<CR>
-map ,jF :CloseSingleConque<CR>:CtrlP factories<CR>
-map ,jT :CloseSingleConque<CR>:CtrlP test<CR>
+map ,ja :CtrlP app/assets<CR>
+map ,jm :CtrlP app/models<CR>
+map ,jc :CtrlP app/controllers<CR>
+map ,jv :CtrlP app/views<CR>
+map ,jh :CtrlP app/helpers<CR>
+map ,jl :CtrlP lib<CR>
+map ,jp :CtrlP public<CR>
+map ,js :CtrlP spec<CR>
+map ,jf :CtrlP fast_spec<CR>
+map ,jd :CtrlP db<CR>
+map ,jC :CtrlP config<CR>
+map ,jV :CtrlP vendor<CR>
+map ,jF :CtrlP factories<CR>
+map ,jT :CtrlP test<CR>
 
 "Cmd-Shift-(M)ethod - jump to a method (tag in current file)
 "Ctrl-m is not good - it overrides behavior of Enter
-nnoremap <silent> <D-M> :CloseSingleConque<CR>:CtrlPBufTag<CR>
+nnoremap <silent> <D-M> :CtrlPBufTag<CR>
diff --git a/vim/settings/git-grep.vim b/vim/settings/git-grep.vim
index 24897f3..8c838cc 100644
--- a/vim/settings/git-grep.vim
+++ b/vim/settings/git-grep.vim
@@ -1,5 +1,5 @@
 "git grep the current word using K (mnemonic Kurrent)
-nnoremap <silent> K :call CloseSingleConque()<CR>:GitGrep <cword><CR>
+nnoremap <silent> K :GitGrep <cword><CR>
 
 function! GetVisual()
   let reg_save = getreg('"')
@@ -14,7 +14,7 @@ function! GetVisual()
 endfunction
 
 "git grep visual selection
-vnoremap K :call CloseSingleConque()<CR>:<C-U>execute GitGrep(GetVisual())<CR>
+vnoremap K :<C-U>execute GitGrep(GetVisual())<CR>
 
 "git grep current word up to the next exclamation point using ,K
 nnoremap ,K viwf!:<C-U>execute GitGrep(GetVisual())<CR>
diff --git a/vim/settings/vim-ruby-conque.vim b/vim/settings/vim-ruby-conque.vim
deleted file mode 100644
index 2829662..0000000
--- a/vim/settings/vim-ruby-conque.vim
+++ /dev/null
@@ -1,4 +0,0 @@
-" prevent auto insert mode, which is helpful when using conque
-" term for running tests
-"
-autocmd WinEnter * stopinsert
diff --git a/vim/settings/vim-ruby-debugger.vim b/vim/settings/vim-ruby-debugger.vim
deleted file mode 100644
index d22a81f..0000000
--- a/vim/settings/vim-ruby-debugger.vim
+++ /dev/null
@@ -1,20 +0,0 @@
-"Disable default maps which are too aggressive, overriding <leader>t and
-"<leader>b
-let g:ruby_debugger_no_maps=1
-
-let os=substitute(system('uname'), '\n', '', '')
-if os == 'Darwin' || os == 'Mac'
-  let g:ruby_debugger_progname='mvim'
-endif
-
-"Make our own maps
-noremap <leader>db  :call ruby_debugger#load_debugger() <bar> call g:RubyDebugger.toggle_breakpoint()<CR>
-noremap <leader>dv  :call ruby_debugger#load_debugger() <bar> call g:RubyDebugger.open_variables()<CR>
-noremap <leader>dm  :call ruby_debugger#load_debugger() <bar> call g:RubyDebugger.open_breakpoints()<CR>
-noremap <leader>dt  :call ruby_debugger#load_debugger() <bar> call g:RubyDebugger.open_frames()<CR>
-noremap <leader>ds  :call ruby_debugger#load_debugger() <bar> call g:RubyDebugger.step()<CR>
-noremap <leader>df  :call ruby_debugger#load_debugger() <bar> call g:RubyDebugger.finish()<CR>
-noremap <leader>dn  :call ruby_debugger#load_debugger() <bar> call g:RubyDebugger.next()<CR>
-noremap <leader>dc  :call ruby_debugger#load_debugger() <bar> call g:RubyDebugger.continue()<CR>
-noremap <leader>de  :call ruby_debugger#load_debugger() <bar> call g:RubyDebugger.exit()<CR>
-noremap <leader>dd  :call ruby_debugger#load_debugger() <bar> call g:RubyDebugger.remove_breakpoints()<CR>
diff --git a/vim/settings/yadr-keymap.vim b/vim/settings/yadr-keymap.vim
index aad7a84..b4d0df1 100644
--- a/vim/settings/yadr-keymap.vim
+++ b/vim/settings/yadr-keymap.vim
@@ -100,7 +100,7 @@ nnoremap <silent> <C-\> :NERDTreeFind<CR>:vertical res 30<CR>
 
 " ,q to toggle quickfix window (where you have stuff like GitGrep)
 " ,oq to open it back up (rare)
-nmap <silent> ,qc :CloseSingleConque<CR>:cclose<CR>
+nmap <silent> ,qc :cclose<CR>
 nmap <silent> ,qo :copen<CR>
 
 " move up/down quickly by using Cmd-j, Cmd-k
@@ -217,16 +217,6 @@ vmap <D-A> :Tabularize /
 nmap sj :SplitjoinSplit<cr>
 nmap sk :SplitjoinJoin<cr>
 
-" ============================
-" vim-ruby-conque
-" ============================
-" Cmd-Shift-R for RSpec
-nmap <silent> <D-R> :call RunRspecCurrentFileConque()<CR>
-" Cmd-Shift-L for RSpec Current Line
-nmap <silent> <D-L> :call RunRspecCurrentLineConque()<CR>
-" ,Cmd-R for Last conque command
-nmap <silent> ,<D-R> :call RunLastConqueCommand()<CR>
-
 " Get the current highlight group. Useful for then remapping the color
 map ,hi :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<' . synIDattr(synID(line("."),col("."),0),"name") . "> lo<" . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">" . " FG:" . synIDattr(synIDtrans(synID(line("."),col("."),1)),"fg#")<CR>
 
diff --git a/vim/vundles.vim b/vim/vundles.vim
index 06bba7a..5f3e46e 100644
--- a/vim/vundles.vim
+++ b/vim/vundles.vim
@@ -20,7 +20,7 @@ Bundle "gmarik/vundle"
 
 " Ruby, Rails, Rake...
 Bundle "ecomba/vim-ruby-refactoring"
-Bundle "skwp/vim-ruby-conque"
+Bundle "skwp/vim-spec-finder"
 Bundle "tpope/vim-rails.git"
 Bundle "tpope/vim-rake.git"
 Bundle "tpope/vim-rvm.git"