diff --git a/install.sh b/install.sh
index a722ff7..b1de0bb 100755
--- a/install.sh
+++ b/install.sh
@@ -88,7 +88,7 @@ setup_youcompleteme() {
 		echo "YouCompleteMe already setup, skipping... (remove .youcompletemesetup to force)"
 	else
 		echo "setting up YouCompleteMe..."
-		cd vim-files/vim/bundle/YouCompleteMe
+		cd vim-files/vim/plugged/YouCompleteMe
 		./install.sh --clang-completer
 		cd $DIR
 		touch .youcompletemesetup
diff --git a/vim-files/vim/ftplugin/ruby.vim b/vim-files/vim/ftplugin/ruby.vim
index 17355c1..6ffd345 100644
--- a/vim-files/vim/ftplugin/ruby.vim
+++ b/vim-files/vim/ftplugin/ruby.vim
@@ -1,2 +1,5 @@
 " Neomake
 let g:neomake_ruby_enabled_makers = ['rubocop']
+
+" Vim-Test
+"let test#ruby#rspec#executable = 'bundle exec rspec'
diff --git a/vim-files/vimrc b/vim-files/vimrc
index 3fa88a5..889abbb 100644
--- a/vim-files/vimrc
+++ b/vim-files/vimrc
@@ -26,9 +26,9 @@ Plug 'tpope/vim-eunuch'
 
 Plug 'majutsushi/tagbar'
 Plug 'SirVer/ultisnips'
+Plug 'honza/vim-snippets'
 
 Plug 'tpope/vim-fugitive'
-Plug 'gregsexton/gitv'
 Plug 'tpope/vim-vinegar'
 Plug 'ctrlpvim/ctrlp.vim'
 Plug 'simnalamburt/vim-mundo'
@@ -90,8 +90,7 @@ let g:syntastic_aggregate_errors = 1
 " Neomake
 autocmd! BufWritePost * Neomake
 
-" NERDTree
-let NERDTreeHijackNetrw = 1
+" NERDTree / netrw
 let g:netrw_liststyle = 3 " let netrw look like NERDTree
 
 " Vim-Test
@@ -100,6 +99,26 @@ nmap <silent> <leader>T :TestFile<CR>
 nmap <silent> <leader>a :TestSuite<CR>
 nmap <silent> <leader>l :TestLast<CR>
 nmap <silent> <leader>g :TestVisit<CR>
+if has('nvim')
+  let test#strategy = "neovim"
+endif
+
+" UltiSnips
+let g:UltiSnipsUsePythonVersion = 2 " required for YCM compat
+let g:ulti_expand_or_jump_res = 0
+function ExpandSnippetOrCarriageReturn()
+    let snippet = UltiSnips#ExpandSnippetOrJump()
+    if g:ulti_expand_or_jump_res > 0
+        return snippet
+    else
+        return "\<CR>"
+    endif
+endfunction
+inoremap <expr> <CR> pumvisible() ? "<C-R>=ExpandSnippetOrCarriageReturn()<CR>" : "\<CR>"
+
+" IndentGuides
+let g:indent_guides_enable_on_vim_startup = 1
+
 """" END PLUGIN SETTINGS
 
 let mapleader=","