diff --git a/.gitmodules b/.gitmodules
index a2ad32a7..7385d102 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -64,3 +64,6 @@
 [submodule "bundle/vim-github-colorscheme"]
 	path = bundle/vim-github-colorscheme
 	url = git@github.com:endel/vim-github-colorscheme.git
+[submodule "bundle/vim-rspec"]
+	path = bundle/vim-rspec
+	url = git@github.com:thoughtbot/vim-rspec.git
diff --git a/bundle/vim-rspec b/bundle/vim-rspec
new file mode 160000
index 00000000..2cf8c500
--- /dev/null
+++ b/bundle/vim-rspec
@@ -0,0 +1 @@
+Subproject commit 2cf8c5002cb89eb8e9aabe59d25b89dc5afec88a
diff --git a/my_configs.vim b/my_configs.vim
index 9d07e662..3aaca983 100644
--- a/my_configs.vim
+++ b/my_configs.vim
@@ -5,8 +5,6 @@ function! SetupCursorLine(...)
   highlight CursorLine ctermbg=NONE cterm=NONE gui=NONE
   highlight LineNr ctermfg=darkgrey
   set cursorline
-  let &colorcolumn="80,".join(range(120,999),",")
-  highlight ColorColumn ctermbg=235
 endfunction
 
 call SetupCursorLine()
@@ -50,6 +48,11 @@ noremap <Down> <NOP>
 noremap <Left> <NOP>
 noremap <Right> <NOP>
 
+" javascript
+let g:javascript_fold = 0
+set nofoldenable
+
+
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " => custom ... WTF, don't remember ;)
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -87,3 +90,9 @@ autocmd BufNewFile,BufReadPost *.feature,*.story set filetype=cucumber
 autocmd BufNewFile,BufRead *.haml setf haml
 autocmd BufNewFile,BufRead *.sass setf sass
 autocmd BufNewFile,BufRead *.scss setf scss
+
+" RSpec.vim mappings
+map <Leader>t :call RunCurrentSpecFile()<CR>
+map <Leader>s :call RunNearestSpec()<CR>
+map <Leader>l :call RunLastSpec()<CR>
+map <Leader>a :call RunAllSpecs()<CR>