diff --git a/.gitmodules b/.gitmodules
index 45b24763..0f4e52d3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,6 +7,6 @@
 [submodule "vim/bundle/vim-colors-solarized"]
 	path = vim/bundle/vim-colors-solarized
 	url = https://github.com/altercation/vim-colors-solarized
-[submodule "bin/willmorgan"]
-  path = bin/willmorgan
-  url = git://gitorious.org/willgit/mainline.git/ bin/willmorgan
+[submodule "vim/bundle/vim-ruby-conque"]
+	path = vim/bundle/vim-ruby-conque
+	url = https://github.com/skwp/vim-ruby-conque
diff --git a/gitignore_global b/gitignore_global
index 1a470da3..48a611b9 100644
--- a/gitignore_global
+++ b/gitignore_global
@@ -1,3 +1,4 @@
 .DS_Store
 tags
 TAGS
+.sass-cache
diff --git a/vim/bundle/vim-ruby-conque b/vim/bundle/vim-ruby-conque
new file mode 160000
index 00000000..27a150f5
--- /dev/null
+++ b/vim/bundle/vim-ruby-conque
@@ -0,0 +1 @@
+Subproject commit 27a150f5525f86c0239d127c54ddfd431790af4e
diff --git a/vimrc b/vimrc
index aa94620f..fdae1dcd 100644
--- a/vimrc
+++ b/vimrc
@@ -268,25 +268,10 @@ let g:ConqueTerm_CWInsert = 1
 let g:ConqueTerm_Color = 2
 
 " Open up a variety of commands in the ConqueTerm
-nmap <silent> <Leader>r :call RunRubyCurrentFileConque()<CR>
-nmap <silent> <Leader>S :call RunRspecCurrentFileConque()<CR>
-nmap <silent> <Leader>R :call RunRakeConque()<CR>
 nmap <silent> <Leader>c :execute 'ConqueTermSplit script/console --irb=pry'<CR>
 nmap <silent> <Leader>i :execute 'ConqueTermSplit pry'<CR>
 nmap <silent> <Leader>b :execute 'ConqueTermSplit /bin/bash --login'<CR>
 
-function RunRubyCurrentFileConque()
-  execute "ConqueTermSplit ruby" bufname('%')
-endfunction
-
-function RunRspecCurrentFileConque()
-  execute "ConqueTermSplit rspec" bufname('%') " --color --format doc"
-endfunction
-
-function RunRakeConque()
-  execute "ConqueTermSplit rake"
-endfunction
-
 let g:ConqueTerm_SendVisKey = '<Leader>e'
 
 " prevent auto insert mode, which is helpful when using conque
@@ -418,3 +403,5 @@ hi! Question guifg=yellow
 " Make EasyMotion more yellow, less red
 hi clear EasyMotionTarget
 hi! EasyMotionTarget guifg=yellow
+
+let g:ruby_conque_rspec_command='spec'