diff --git a/fzf.vim b/fzf.vim
new file mode 100644
index 0000000..52458e0
--- /dev/null
+++ b/fzf.vim
@@ -0,0 +1,4 @@
+" mappings to more quickly pull up fzf
+nnoremap <Leader>f :Files
+nnoremap <Leader>b :Buffers
+nnoremap <Leader>t :Tags
diff --git a/plug.vim b/plug.vim
new file mode 100644
index 0000000..219b660
--- /dev/null
+++ b/plug.vim
@@ -0,0 +1,40 @@
+call plug#begin("~/.vim/plugged")
+
+" look for .editorconfig and merge into vim settings
+Plug 'editorconfig/editorconfig-vim'
+" file and dir browser
+Plug 'scrooloose/nerdtree'
+" syntax checking on steroids
+Plug 'scrooloose/syntastic'
+" integrate ag, especially to be able to open matches, hugely useful for
+" code aware search
+Plug 'rking/ag.vim'
+" lightweight but sophisticated status line
+Plug 'vim-airline/vim-airline'
+Plug 'vim-airline/vim-airline-themes'
+" git integration
+Plug 'tpope/vim-fugitive'
+Plug 'airblade/vim-gitgutter'
+" visualize vim's undo tree
+Plug 'sjl/gundo.vim'
+" better support for JS
+Plug 'pangloss/vim-javascript'
+" find, complete, etc. on steroids
+" fast fuzzy finder
+Plug 'junegunn/fzf'
+Plug 'junegunn/fzf.vim'
+" auto detect tab and space handling rather than setting per project
+Plug 'tpope/vim-sleuth'
+" support for the Rust programming language
+Plug 'rust-lang/rust.vim'
+" support for Rust's build tool/dependency manager
+Plug 'timonv/vim-cargo'
+" support for quickly changing font size
+Plug 'drmikehenry/vim-fontsize'
+" support for jsonnet
+Plug 'google/vim-jsonnet'
+" support for racer
+Plug 'racer-rust/vim-racer'
+
+" All of your Plugins must be added before the following line
+call plug#end()            " required
diff --git a/unite.vim b/unite.vim
deleted file mode 100644
index 64d9766..0000000
--- a/unite.vim
+++ /dev/null
@@ -1,8 +0,0 @@
-" use the silver searcher with Unite's async file recursion
-let g:unite_source_rec_async_command = ['ag', '--follow', '--nocolor', '--nogroup', '--hidden', '-g', '']
-" set default matcher in unite to fuzzy
-call unite#filters#matcher_default#use(['matcher_fuzzy'])
-" open Unite ready for recursively, fuzzy match files
-nnoremap <Leader>f :Unite -start-insert file_rec/async:!<CR>
-nnoremap <Leader>b :Unite -start-insert buffer<CR>
-nnoremap <Leader>m :Unite -start-insert bookmark<CR>
diff --git a/vimrc b/vimrc
index 6cb7a2d..6cca09e 100644
--- a/vimrc
+++ b/vimrc
@@ -8,10 +8,10 @@ let mapleader = "\<Space>"
 " source aux files also under git control
 let oldwd = getcwd()
 exec "cd " . vimrc_git
-source vundle.vim
+source plug.vim
 source airline.vim
 source syntastic.vim
-" source unite.vim
+source fzf.vim
 source mapping.vim
 source jsonnet.vim
 source racer.vim
diff --git a/vundle.vim b/vundle.vim
deleted file mode 100644
index 05488dd..0000000
--- a/vundle.vim
+++ /dev/null
@@ -1,59 +0,0 @@
-set nocompatible              " be iMproved, required
-filetype off                  " required
-
-" set the runtime path to include Vundle and initialize
-set rtp+=~/.vim/bundle/Vundle.vim
-call vundle#begin()
-" alternatively, pass a path where Vundle should install plugins
-"call vundle#begin('~/some/path/here')
-
-" let Vundle manage Vundle, required
-Plugin 'gmarik/Vundle.vim'
-" map a hotkey to open a split buffer showing the ctags driven structure of some
-" source
-Plugin 'Tagbar'
-" dependency for easytags
-Plugin 'vim-misc'
-" continuously update ctags as buffers are saved
-Plugin 'easytags.vim'
-" look for .editorconfig and merge into vim settings
-Plugin 'editorconfig/editorconfig-vim'
-" file and dir browser
-Plugin 'scrooloose/nerdtree'
-" syntax checking on steroids
-Plugin 'scrooloose/syntastic'
-" integrate ag, especially to be able to open matches, hugely useful for
-" code aware search
-Plugin 'rking/ag.vim'
-" lightweight but sophisticated status line
-Plugin 'vim-airline/vim-airline'
-Plugin 'vim-airline/vim-airline-themes'
-" git integration
-Plugin 'tpope/vim-fugitive'
-" visualize vim's undo tree
-Plugin 'sjl/gundo.vim'
-" better support for JS
-Plugin 'pangloss/vim-javascript'
-" find, complete, etc. on steroids
-" fast fuzzy finder
-Plugin 'junegunn/fzf'
-Plugin 'junegunn/fzf.vim'
-" auto detect tab and space handling rather than setting per project
-Plugin 'tpope/vim-sleuth'
-" auto completion engine for vim
-Plugin 'Valloric/YouCompleteMe'
-" support for understanding JS within vim, works with YCM
-Plugin 'marijnh/tern_for_vim'
-" support for the Rust programming language
-Plugin 'rust-lang/rust.vim'
-" support for Rust's build tool/dependency manager
-Plugin 'timonv/vim-cargo'
-" support for quickly changing font size
-Plugin 'drmikehenry/vim-fontsize'
-" support for jsonnet
-Plugin 'google/vim-jsonnet'
-" support for racer
-Plugin 'racer-rust/vim-racer'
-
-" All of your Plugins must be added before the following line
-call vundle#end()            " required