diff --git a/vim/.vimrc b/vim/.vimrc
index e8a26cdc..0832449c 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -140,6 +140,11 @@ let airline#extensions#wordcount#enabled = 0
 let netrw_banner = 0
 let ycm_autoclose_preview_window_after_insertion = 1
 
+set timeoutlen=2000
+autocmd InsertEnter * set timeoutlen=500
+autocmd InsertLeave * set timeoutlen=2000
+inoremap jj <Esc>
+
 function s:SockHop(...)
     let args = ''
     if a:0
@@ -159,13 +164,8 @@ endfunction
 command -nargs=? SockHop :call s:SockHop(<f-args>)
 command -nargs=? SockHopMake :call s:SockHopMake(<f-args>)
 
-nnoremap <silent> <Leader>[ :bprevious<CR>
-nnoremap <silent> <Leader>] :bnext<CR>
 nnoremap <silent> <Leader>aa :Ack! -Qw <cword><CR>
 nnoremap <silent> <Leader>ac :Ack! -Qw -t cc <cword><CR>
-nnoremap <silent> <Leader>mc :SockHopMake clean<CR>
-nnoremap <silent> <Leader>mm :SockHopMake develop<CR>
-nnoremap <silent> <Leader>mr :SockHopMake run<CR>
 nnoremap <silent> <Leader>cc :YcmCompleter GoTo<CR>
 nnoremap <silent> <Leader>cd :YcmDiags<CR>
 nnoremap <silent> <Leader>cf :YcmCompleter FixIt<CR>
@@ -173,8 +173,7 @@ nnoremap <silent> <Leader>ch :YcmCompleter GetDoc<CR>
 nnoremap <silent> <Leader>cr :YcmForceCompileAndDiagnostics<CR>
 nnoremap <silent> <Leader>cs :YcmShowDetailedDiagnostic<CR>
 nnoremap <silent> <Leader>ct :YcmCompleter GetType<CR>
-inoremap jj <Esc>
-
-set timeoutlen=2000
-autocmd InsertEnter * set timeoutlen=500
-autocmd InsertLeave * set timeoutlen=2000
+nnoremap <silent> <Leader>mc :SockHopMake clean<CR>
+nnoremap <silent> <Leader>mm :SockHopMake develop<CR>
+nnoremap <silent> <Leader>mr :SockHopMake run<CR>
+nnoremap <silent> <Leader>r :SockHop .run.sock '"$@"'<CR>