diff --git a/.bashrc b/.bashrc
index eceda6b..842a517 100644
--- a/.bashrc
+++ b/.bashrc
@@ -28,3 +28,5 @@ fi
 
 # Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
 export PATH="$PATH:$HOME/.rvm/bin"
+
+[ -f ~/.fzf.bash ] && source ~/.fzf.bash
diff --git a/.zshrc b/.zshrc
index 22c48ec..b37a49a 100644
--- a/.zshrc
+++ b/.zshrc
@@ -62,3 +62,5 @@ export PATH="$PATH:$HOME/.rvm/bin"
 
 # Makes <C-a> <C-e> work in zsh+tmux
 bindkey -e
+
+[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
diff --git a/vim/mappings.vim b/vim/mappings.vim
index 278086f..884c119 100644
--- a/vim/mappings.vim
+++ b/vim/mappings.vim
@@ -8,11 +8,6 @@ noremap <leader><leader> :e #<CR>
 " ctags
 nnoremap <C-b> <C-]>
 
-"--- Comments
-" Clear all comment markers
-map - <leader>ci
-" Comment code
-"map - <leader>cl"
 
 "--- Whitespace
 " To make it show up in new tabs - use Ctrl-E
@@ -34,3 +29,8 @@ nnoremap <leader>sv :source $MYVIMRC<cr>
 " omg, so much easier to see next occurance!
 nnoremap n nzz
 nnoremap N Nzz
+
+" quickfix shortcuts
+map <C-n> :cnext<CR>
+map <C-m> :cprevious<CR>
+nnoremap <C-q> :cclose<CR>
diff --git a/vim/plugin.ag.vim b/vim/plugin.ag.vim
deleted file mode 100644
index dd819f5..0000000
--- a/vim/plugin.ag.vim
+++ /dev/null
@@ -1,7 +0,0 @@
-" Customize the command run by :Ag
-"   -S: smart-case - only case sensitive on caps
-"   --nocolor: Don't show color codes
-"   --nogroup: Don't grp results from one file
-"   --colum: Print numbers in left column
-"   --ignore: files to ignore
-let g:ag_prg='ag -S --nocolor --nogroup --column'
diff --git a/vim/plugin.ctrlp.vim b/vim/plugin.ctrlp.vim
deleted file mode 100644
index a2dfb40..0000000
--- a/vim/plugin.ctrlp.vim
+++ /dev/null
@@ -1,9 +0,0 @@
-let g:ctrlp_custom_ignore = {
-\ 'dir': '\vpublic\/assets',
-\ }
-" Ignore files in .gitignore
-let g:ctrlp_user_command = ['.git', 'cd %s && git ls-files -co --exclude-standard']
-" Set no max number of files to index, otherwise in large repos not everything
-" shows up
-let g:ctrlp_max_files=0
-
diff --git a/vim/plugin.deocomplete.vim b/vim/plugin.deocomplete.vim
deleted file mode 100644
index 79222e4..0000000
--- a/vim/plugin.deocomplete.vim
+++ /dev/null
@@ -1 +0,0 @@
-let g:deoplete#enable_at_startup = 1
diff --git a/vim/plugin.deoplete-go.vim b/vim/plugin.deoplete-go.vim
deleted file mode 100644
index dd2ad5e..0000000
--- a/vim/plugin.deoplete-go.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-"deoplete enabled at startup
-let g:deoplete#enable_at_startup = 1
diff --git a/vim/plugin.fzf.vim b/vim/plugin.fzf.vim
new file mode 100644
index 0000000..301fa52
--- /dev/null
+++ b/vim/plugin.fzf.vim
@@ -0,0 +1,7 @@
+" extra key bindings
+let g:fzf_action = {
+  \ 'ctrl-t': 'tab split',
+  \ 'ctrl-x': 'split',
+  \ 'ctrl-v': 'vsplit' }
+
+nnoremap <C-p> :FZF<CR>
diff --git a/vim/plugin.jsx.vim b/vim/plugin.jsx.vim
deleted file mode 100644
index ae39514..0000000
--- a/vim/plugin.jsx.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-" Enable jsx highlighting in js files
-let g:jsx_ext_required = 0
diff --git a/vim/plugin.neomake.vim b/vim/plugin.neomake.vim
index 477bb51..724450c 100644
--- a/vim/plugin.neomake.vim
+++ b/vim/plugin.neomake.vim
@@ -75,17 +75,3 @@ let g:neomake_verbose     = 1
 
 " autocmd! BufWritePost * Neomake
 command Errors lopen
-
-
-" options for runnign neomake on save
-" autocmd BufWritePost * call neomake#Make(1, [], function('s:Neomake_callback'))
-" call neomake#configure#automake('w')
-" autocmd BufWritePost * Neomake
-
-function! s:Neomake_callback(options)
-	if(a:options.status == 0)
-		edit
-		checktime
-	endif
-endfunction
-
diff --git a/vim/plugin.neosnippet.vim b/vim/plugin.neosnippet.vim
deleted file mode 100644
index 683f0b8..0000000
--- a/vim/plugin.neosnippet.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-" Plugin key-mappings.
-" Note: It must be "imap" and "smap".  It uses <Plug> mappings.
-imap <C-k>     <Plug>(neosnippet_expand_or_jump)
-smap <C-k>     <Plug>(neosnippet_expand_or_jump)
-xmap <C-k>     <Plug>(neosnippet_expand_target)
diff --git a/vim/plugin.nerdcommenter.vim b/vim/plugin.nerdcommenter.vim
index d9274cf..75eb0d3 100644
--- a/vim/plugin.nerdcommenter.vim
+++ b/vim/plugin.nerdcommenter.vim
@@ -1 +1,4 @@
 let NERDSpaceDelims=1          " Add a space before comments
+
+" Clear all comment markers
+map - <leader>ci
diff --git a/vim/plugin.nerdtree.vim b/vim/plugin.nerdtree.vim
index 33fad26..a57a61a 100644
--- a/vim/plugin.nerdtree.vim
+++ b/vim/plugin.nerdtree.vim
@@ -1,3 +1,2 @@
-map <C-n> :NERDTreeToggle<CR>
-map <C-m> :NERDTreeFind<CR>
-" map <C-n> :NERDTreeToggle<CR>:NERDTreeMirror<CR>
+map <leader>n :NERDTreeToggle<CR>
+map <leader>m :NERDTreeFind<CR>
diff --git a/vim/plugin.test.vim b/vim/plugin.test.vim
deleted file mode 100644
index 680a278..0000000
--- a/vim/plugin.test.vim
+++ /dev/null
@@ -1,6 +0,0 @@
-let test#strategy = "neovim"
-
-nmap <silent> <leader>s :TestNearest<CR>
-nmap <silent> <leader>f :TestFile<CR>
-nmap <silent> <leader>a :TestSuite<CR>
-nmap <silent> <leader>l :TestLast<CR>
diff --git a/vim/plugin.vim-closetag.vim b/vim/plugin.vim-closetag.vim
deleted file mode 100644
index 9206fdc..0000000
--- a/vim/plugin.vim-closetag.vim
+++ /dev/null
@@ -1 +0,0 @@
-let g:closetag_filenames = "*.html,*.xhtml,*.phtml,*.js,*.jsx"
diff --git a/vim/plugin.vim-go.vim b/vim/plugin.vim-go.vim
index 593191e..c3ea259 100644
--- a/vim/plugin.vim-go.vim
+++ b/vim/plugin.vim-go.vim
@@ -4,11 +4,6 @@ let g:go_fmt_command = "goimports"
 " save automatically before :make
 set autowrite
 
-" quickfix shortcuts
-map <leader>n :cnext<CR>
-map <leader>m :cprevious<CR>
-nnoremap <leader>q :cclose<CR>
-
 " ---------- shortcuts
 " run :GoBuild or :GoTestCompile based on the go file
 function! s:build_go_files()
diff --git a/vim/plugins.vim b/vim/plugins.vim
index d60ea7d..9a54235 100644
--- a/vim/plugins.vim
+++ b/vim/plugins.vim
@@ -6,52 +6,21 @@ Plug 'airblade/vim-gitgutter'
 Plug 'itchyny/lightline.vim'
 
 " Tools
-Plug 'ctrlpvim/ctrlp.vim'
-Plug 'scrooloose/nerdcommenter'
 Plug 'scrooloose/nerdtree'
-Plug 'nathanaelkane/vim-indent-guides'
-Plug 'tpope/vim-fugitive'
-Plug 'tpope/vim-surround'
-Plug 'tpope/vim-endwise'
-Plug 'vim-scripts/Align'
-Plug 'jiangmiao/auto-pairs'
-Plug 'tpope/vim-repeat'
-Plug 'alvan/vim-closetag'
-Plug 'gcmt/taboo.vim'
-Plug 'sickill/vim-pasta'
-Plug 'sjl/gundo.vim'
+Plug 'scrooloose/nerdcommenter'
 Plug 'christoomey/vim-tmux-navigator'
-Plug 'editorconfig/editorconfig-vim'
-Plug 'tpope/vim-unimpaired'
-
+Plug 'tpope/vim-fugitive'
+Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
 Plug 'wincent/ferret' "ripgrep
-Plug 'neomake/neomake' " easily run linters/compilers sync
-
-" Neovim only
-Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
-Plug 'zchee/deoplete-go', { 'do': 'make'}
-Plug 'Shougo/neosnippet'
-Plug 'Shougo/neosnippet-snippets'
+Plug 'jiangmiao/auto-pairs'
 
 " Languages
 Plug 'fatih/vim-go', { 'do': ':GoInstallBinaries' }
-Plug 'pangloss/vim-javascript'
-Plug 'tpope/vim-rails'
-Plug 'vim-ruby/vim-ruby'
-Plug 'mxw/vim-jsx'
-
 
 call plug#end()
 
+"-------------------------
 " Retired plugins - still interesting
-" cTags
-" Plug 'xolox/vim-easytags'
-" Plug 'xolox/vim-misc'
-" Plug 'majutsushi/tagbar'
-
-" find/replace
-" Plug 'brooth/far.vim', { 'do': ':UpdateRemotePlugins' } "interactive find and replace
-" Plug 'dkprice/vim-easygrep'
 
-" testing
-" Plug 'janko-m/vim-test'
+" visible indent guides
+" Plug 'nathanaelkane/vim-indent-guides'