diff --git a/bash/.bashrc b/bash/.bashrc
index 69e126b..05e3b8e 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -55,6 +55,8 @@ alias gl='git lg'
 alias gr='git reset'
 alias gh='git lg -1'
 
+alias ss='spring stop'
+
 alias rdc='bin/rails db:create'
 alias rdd='bin/rails db:drop'
 alias rdm='bin/rails db:migrate'
diff --git a/vim/.vimrc b/vim/.vimrc
index 2b6355c..f9cca3c 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -471,7 +471,7 @@ set conceallevel=2
 " Highlight VCS conflict markers
 match ErrorMsg '^\(<\|=\|>\)\{7\}\([^=].\+\)\?$'
 
-set statusline=%<%f\ (%{&ft})\ %-4(%m%)%=%-19(%3l,%02c%03V%)
+set statusline=%<%f
 
 " ========================================================
 " -> Behavior & Different Tricks
@@ -599,6 +599,7 @@ nnoremap <silent> <leader>t :tabnew<CR>
 nnoremap <silent> <leader>d orequire 'pry'; binding.pry<ESC>
 nnoremap <silent> <leader>D Orequire 'pry'; binding.pry<ESC>
 nnoremap <silent> <leader>r :TestFile<CR>
+nnoremap <silent> <leader>R :TestSuite<CR>
 nnoremap <silent> <leader>j :%!python -m json.tool<CR>
 nnoremap <silent> <leader>w :w<CR>
 nnoremap <silent> <leader>e :e!<CR>
@@ -663,6 +664,8 @@ cnoremap <C-a> <HOME>
 " TODO: this requires double C-b for some reason
 nnoremap <silent><C-b> :Gblame<CR>
 
+nnoremap <C-s> :%s//g<left><left>
+
 " ,rh -> hashrocket to : TODO: think about it
 " nnoremap <leader>rh :%s/\v:(\w+) \=\>/\1:/g<CR>
 
@@ -693,3 +696,6 @@ else
   let &t_SI = "\<Esc>]50;CursorShape=1\x7"
   let &t_EI = "\<Esc>]50;CursorShape=0\x7"
 endif
+
+" replace the word under the cursor
+nnoremap <leader>S :%s/\<<c-r><c-w>\>//g<left><left>