use vim-plug instead of vundle for plugin management

.gitignore

@@ -1,5 +1,7 @@
 *.sw*
 vim-files/vim/bundle
+vim-files/vim/plugged/
 vim-files/vim/undofiles/
 .youcompletemesetup
 vim-files/vim/.init.vim-rplugin~
+vim-files/vim/.netrwhist

.gitmodules

@@ -81,9 +81,6 @@
 [submodule "vim-files/.vim/bundle/YouCompleteMe"]
 	path = vim-files/.vim/bundle/YouCompleteMe
 	url = https://github.com/Valloric/YouCompleteMe.git
-[submodule "vim-files/vim/bundle/vundle"]
-	path = vim-files/vim/bundle/vundle
-	url = https://github.com/gmarik/Vundle.vim.git
 [submodule "zsh-files/antigen"]
 	path = zsh-files/antigen
 	url = https://github.com/zsh-users/antigen.git

vim-files/vim/bundle/vundle

@@ -1 +0,0 @@
-Subproject commit 5f70ae6025e951f0154e3940d123138adffa4c88

vim-files/vim/ftplugin/ruby.vim

@@ -1,5 +1,8 @@
 " Neomake
 let g:neomake_ruby_enabled_makers = ['rubocop']
+let g:neomake_ruby_rubocop_maker = {
+  \ 'args': ['--except', 'Style/TrailingComma,Style/Documentation,Metrics/ClassLength,Metrics/ModuleLength,Metrics/MethodLength,Style/SignalException'],
+  \}
 
 " vim-rspec mappings
 nnoremap <Leader>t :call RunCurrentSpecFile()<CR>

vim-files/vimrc

@@ -1,53 +1,50 @@
 set nocompatible " required
 filetype off " required
 
-"""" VUNDLE
-" set the runtime path to include Vundle and initialize
-set rtp+=~/.vim/bundle/vundle/
-call vundle#rc()
-" alternatively, pass a path where Vundle should install bundles
-"let path = '~/some/path/here'
-"call vundle#rc(path)
+"""" VIM-PLUG
+call plug#begin('~/.vim/plugged')
 
-" let Vundle manage Vundle, required
-Plugin 'gmarik/vundle'
+Plug 'tpope/vim-sensible'
 
-Plugin 'tpope/vim-sensible'
+Plug 'nanotech/jellybeans.vim'
 
-Plugin 'nanotech/jellybeans.vim'
+Plug 'bling/vim-airline'
+Plug 'bling/vim-bufferline'
+Plug 'myusuf3/numbers.vim'
+Plug 'mhinz/vim-signify'
+Plug 'nathanaelkane/vim-indent-guides'
 
-Plugin 'bling/vim-airline'
-Plugin 'bling/vim-bufferline'
-Plugin 'myusuf3/numbers.vim'
-Plugin 'mhinz/vim-signify'
-Plugin 'nathanaelkane/vim-indent-guides'
+Plug 'danro/rename.vim'
+Plug 'pbrisbin/vim-mkdir'
+Plug 'Lokaltog/vim-easymotion'
+Plug 'tpope/vim-characterize'
+Plug 'tpope/vim-surround'
+Plug 'tpope/vim-commentary'
+Plug 'terryma/vim-multiple-cursors'
 
-Plugin 'danro/rename.vim'
-Plugin 'pbrisbin/vim-mkdir'
-Plugin 'Lokaltog/vim-easymotion'
-Plugin 'tpope/vim-characterize'
-Plugin 'tpope/vim-surround'
-Plugin 'terryma/vim-multiple-cursors'
+Plug 'tpope/vim-eunuch'
 
-Plugin 'tpope/vim-eunuch'
+Plug 'majutsushi/tagbar'
+Plug 'SirVer/ultisnips'
 
-Plugin 'majutsushi/tagbar'
-Plugin 'SirVer/ultisnips'
+Plug 'tpope/vim-fugitive'
+Plug 'gregsexton/gitv'
+Plug 'scrooloose/nerdtree'
+Plug 'tpope/vim-vinegar'
+Plug 'ctrlpvim/ctrlp.vim'
+Plug 'simnalamburt/vim-mundo'
+Plug 'vim-ruby/vim-ruby'
+Plug 'tpope/vim-rails'
 
-Plugin 'tpope/vim-fugitive'
-Plugin 'scrooloose/nerdtree'
-Plugin 'kien/ctrlp.vim'
-Plugin 'simnalamburt/vim-mundo'
-Plugin 'tpope/vim-rails'
+Plug 'tpope/vim-endwise'
 
-Plugin 'tpope/vim-endwise'
+Plug 'benekastah/neomake'
+Plug 'Valloric/YouCompleteMe'
 
-"Plugin 'scrooloose/syntastic'
-Plugin 'benekastah/neomake'
-Plugin 'Valloric/YouCompleteMe'
+Plug 'kchmck/vim-coffee-script'
+Plug 'mtscout6/vim-cjsx'
 
-Plugin 'kchmck/vim-coffee-script'
-Plugin 'mtscout6/vim-cjsx'
+call plug#end()
 
 filetype plugin indent on     " required
 """ end vundle
@@ -90,9 +87,14 @@ let g:indent_guides_start_level = 2
 let g:syntastic_quiet_messages = {'level': []} " do NOT silence warnings
 let g:syntastic_aggregate_errors = 1
 
-"Neomake
+" Neomake
 autocmd! BufWritePost * Neomake
 
+" NERDTree
+let NERDTreeHijackNetrw = 1
+map \q :q<CR>
+map \w :w<CR>
+noremap Q <nop>
 """" END PLUGIN SETTINGS
 
 let mapleader=","
@@ -191,10 +193,6 @@ map <silent> <leader>V :source ~/.vimrc<CR>:filetype detect<CR>:exe ":echo 'vimr
 "terminal remaps
 tnoremap <Esc> <C-\><C-n>
 
-"nnoremap <leader>d :NERDTreeToggle<cr>
-map \q :q<CR>
-map \w :w<CR>
-noremap Q <nop>
 " Quicker window movement
 nnoremap <C-j> <C-w>j
 nnoremap <C-k> <C-w>k