diff --git a/.gitignore b/.gitignore
index 684f28f..405c5dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 vim-files/vim/bundle
 vim-files/vim/undofiles/
 .youcompletemesetup
+vim-files/vim/.init.vim-rplugin~
diff --git a/vim-files/vim/ftplugin/python.vim b/vim-files/vim/ftplugin/python.vim
index 21afdd6..a510967 100644
--- a/vim-files/vim/ftplugin/python.vim
+++ b/vim-files/vim/ftplugin/python.vim
@@ -1,6 +1,5 @@
-" Syntastic
-let g:syntastic_python_checkers = ['pyflakes', 'pep8', 'pep257']
-let g:syntastic_python_pep8_args='--ignore=E501'
+" Neomake
+let g:neomake_python_enabled_makers = ['pyflakes', 'pep8']
 
 """ Handy remaps
 noremap <leader>b Oimport ipdb;ipdb.set_trace()<Esc>
diff --git a/vim-files/vim/ftplugin/ruby.vim b/vim-files/vim/ftplugin/ruby.vim
index 09d7fce..119197f 100644
--- a/vim-files/vim/ftplugin/ruby.vim
+++ b/vim-files/vim/ftplugin/ruby.vim
@@ -1,5 +1,5 @@
-" Syntastic
-let g:syntastic_ruby_checkers = ['rubocop']
+" Neomake
+let g:neomake_ruby_enabled_makers = ['rubocop']
 
 " vim-rspec mappings
 nnoremap <Leader>t :call RunCurrentSpecFile()<CR>
diff --git a/vim-files/vimrc b/vim-files/vimrc
index 042960c..c829292 100644
--- a/vim-files/vimrc
+++ b/vim-files/vimrc
@@ -99,7 +99,6 @@ let mapleader=","
 set nobackup
 set noswapfile
 set pastetoggle=<F2>
-set shell=/bin/sh
 
 filetype on
 filetype plugin indent on
@@ -189,6 +188,9 @@ endfunction
 noremap ; :
 inoremap jj <Esc>
 map <silent> <leader>V :source ~/.vimrc<CR>:filetype detect<CR>:exe ":echo 'vimrc reloaded'"<CR>
+"terminal remaps
+tnoremap <Esc> <C-\><C-n>
+
 "nnoremap <leader>d :NERDTreeToggle<cr>
 map \q :q<CR>
 map \w :w<CR>