Commit 5555969

@@ -157,14 +157,6 @@ nnoremap <silent> <leader>cd :lcd %:h<CR>
 " Create the directory containing the file in the buffer
 nnoremap <silent> <leader>md :!mkdir -p %:p:h<CR>
 
-" Some helpers to edit mode
-" http://vimcasts.org/e/14
-nnoremap <leader>ew :e <C-R>=expand('%:h').'/'<cr>
-nnoremap <leader>es :sp <C-R>=expand('%:h').'/'<cr>
-nnoremap <leader>ev :vsp <C-R>=expand('%:h').'/'<cr>
-nnoremap <leader>et :tabe <C-R>=expand('%:h').'/'<cr>
-nnoremap <leader>e :e <C-R>=expand("%:p:h") . "/" <CR>
-
 " Swap two words
 nnoremap <silent> gw :s/\(\%#\w\+\)\(\_W\+\)\(\w\+\)/\3\2\1/<CR>`'
 
@@ -201,51 +193,40 @@ nnoremap <C-j> <C-w>j<C-w>_
 nnoremap <C-k> <C-w>k<C-w>_
 nnoremap <C-l> <C-w>l
 nnoremap <leader>p "+p
-" NERDTree
 nnoremap <leader>n :NERDTreeFind<cr>
 nnoremap <localleader>n :NERDTreeClose<cr>
 " open fold
 nnoremap <space> za
 " create fold
 vnoremap <space> zf
-" operator pending movement (cp -> change inside parens)
-onoremap p i(
-onoremap b /end<cr>
-" inside parens ie. cin(
-onoremap in( :<c-u>normal! f(vi(<cr>
-" inside last parens ie. cil(
-onoremap il( :<c-u>normal! F)vi(<cr>
-" inside markdown heading
-onoremap ih :<c-u>execute "normal! ?^==\\+$\r:nohlsearch\rkvg_"<cr>
-" around markdown heading
-onoremap ah :<c-u>execute "normal! ?^==\\+$\r:nohlsearch\rg_vk0"<cr>
 " surround with "
 nnoremap <leader>" viw<esc>a"<esc>hbi"<esc>lel
 nnoremap <leader>' viw<esc>a'<esc>hbi'<esc>lel
-" move to start of line
 nnoremap H ^
-" move to end of line
 nnoremap L $
-" escape
 inoremap jk <esc>
-nnoremap  <C-e> :e#<cr>
 " NERDComToggleComment
 nmap <localleader>/ <leader>c<space>
 vmap <localleader>/ <leader>c<space>
-
-" git fugitive
 nnoremap <leader>gs :Gstatus<cr>
 nnoremap <leader>gb :Gblame<cr>
 
 nnoremap / /\v
 vnoremap / /\v
-nnoremap K :grep! "\b<C-R><C-W>\b"<CR>:cw<CR>
-command! -nargs=+ -complete=file -bar FindInFiles silent! grep! <args>|cwindow|redraw!
 nnoremap <localleader>F :Ag<space>
 nnoremap <localleader>f :Ack<space>
 nnoremap <C-n> :GFiles<cr>
-nnoremap <C-p> :FZF<cr>
-nnoremap <leader>b :Buffers<cr>
+nnoremap <C-p> :Files<cr>
+nnoremap <C-e> :Buffers<cr>
+nnoremap <leader>f :grep! "\b<C-R><C-W>\b"<CR>:cw<CR>
+command! -nargs=+ -complete=file -bar FindInFiles silent! grep! <args>|cwindow|redraw!
+
+nmap <leader><tab> <plug>(fzf-maps-n)
+xmap <leader><tab> <plug>(fzf-maps-x)
+omap <leader><tab> <plug>(fzf-maps-o)
+
+imap <c-x><c-k> <plug>(fzf-complete-word)
+imap <c-x><c-l> <plug>(fzf-complete-line)
 
 if executable('ag')
   let g:ackprg = 'ag --nogroup --nocolor --column'