diff --git a/020_neovim.sh b/020_neovim.sh
index 0e2c653..8c27865 100644
--- a/020_neovim.sh
+++ b/020_neovim.sh
@@ -35,12 +35,14 @@ call vundle#rc()
 " core plugins
 Bundle "gmarik/vundle"
 Bundle "flazz/vim-colorschemes"
-Bundle "kien/ctrlp.vim"
+"Bundle "kien/ctrlp.vim"
+Bundle "ctrlpvim/ctrlp.vim"
 
 " vim main plugins
 Bundle "sjl/gundo.vim"
 Bundle "bling/vim-airline"
 Bundle "vim-airline/vim-airline-themes"
+Bundle "ryanoasis/vim-devicons"
 Bundle "jlanzarotta/bufexplorer"
 Bundle "scrooloose/syntastic.git"
 Bundle "vim-scripts/tComment"
@@ -49,6 +51,7 @@ Bundle "mileszs/ack.vim"
 Bundle "rking/ag.vim"
 Bundle "edsono/vim-matchit"
 Bundle "tpope/vim-fugitive"
+Bundle 'jreybert/vimagit' 
 Bundle "henrik/vim-indexed-search"
 Bundle "tpope/vim-abolish"
 Bundle "tpope/vim-repeat"
@@ -66,6 +69,7 @@ Bundle "scrooloose/nerdtree"
 Bundle "tpope/vim-vinegar"
 Bundle "vim-scripts/taglist.vim"
 Bundle "majutsushi/tagbar"
+Bundle "sbdchd/neoformat"
 
 " language vundles
 Bundle "pangloss/vim-javascript"
@@ -83,7 +87,8 @@ Bundle "vim-scripts/SQLUtilities"
 Bundle "NagatoPain/AutoSQLUpperCase.vim"
 
 " autocomplete
-Bundle "Valloric/YouCompleteMe"
+" Bundle "Valloric/YouCompleteMe"
+Bundle 'davidhalter/jedi-vim'
 Bundle "MarcWeber/vim-addon-mw-utils"
 Bundle "tomtom/tlib_vim"
 
@@ -255,12 +260,48 @@ let g:airline#extensions#tabline#tab_nr_type   =  1 " tab number
 let g:airline#extensions#tabline#fnamecollapse =  1 " /a/m/model.rb
 let g:airline#extensions#hunks#non_zero_only   =  1 " git gutter
 
+" Syntastic
+" show list of errors and warnings on the current file
+nmap <leader>e :Errors<CR>
+" turn to next or previous errors, after open errors list
+nmap <leader>n :lnext<CR>
+nmap <leader>p :lprevious<CR>
+" check also when just opened the file
+let g:syntastic_check_on_open = 1
+
+" syntastic checker for javascript.
+" eslint is the only tool support JSX.
+" If you don't need write JSX, you can use jshint.
+" And eslint is slow, but not a hindrance
+let g:syntastic_javascript_checkers = ['jshint']
+" let g:syntastic_javascript_checkers = ['eslint']
+
+" syntastic checker for python.
+" let g:syntastic_python_checkers = ["pylint"]
+" let g:syntastic_python_checkers = ["flake8"]
+let g:syntastic_python_checkers = ['prospector']
+let g:syntastic_always_populate_loc_list = 1
+let g:syntastic_auto_loc_list = 1
+let g:syntastic_check_on_open = 1
+let g:syntastic_enable_signs = 1
+
+" don't put icons on the sign column (it hides the vcs status icons of signify)
+let g:syntastic_enable_signs = 1
+
+" custom icons (enable them if you use a patched font, and enable the previous 
+" setting)
+let g:syntastic_error_symbol = '✗'
+let g:syntastic_warning_symbol = '⚠'
+let g:syntastic_style_error_symbol = '✗'
+let g:syntastic_style_warning_symbol = '⚠'
+
+
 " YouCompleteMe
-let g:ycm_filetype_blacklist = {}
-let g:ycm_key_list_select_completion = []
-let g:ycm_key_list_previous_completion = []
-let g:ycm_key_invoke_completion = "<C-j>"
-let g:ycm_collect_identifiers_from_tags_files = 1
+"let g:ycm_filetype_blacklist = {}
+"let g:ycm_key_list_select_completion = []
+"let g:ycm_key_list_previous_completion = []
+"let g:ycm_key_invoke_completion = "<C-j>"
+"let g:ycm_collect_identifiers_from_tags_files = 1
 
 if executable("ag")
   let g:ackprg = "ag --nogroup --column"
diff --git a/020_vim.sh b/020_vim.sh
index d530529..ba78812 100644
--- a/020_vim.sh
+++ b/020_vim.sh
@@ -98,7 +98,7 @@ cat > ~/.Xresources << 'EOF'
 *color15: #C5C8C6
 EOF
 
-cd ~
+cd ~ || exit
 apt-get install  -y git
 git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
 
@@ -126,6 +126,7 @@ Plugin 'VundleVim/Vundle.vim'
 
 " plugin on GitHub repos
 Plugin 'tpope/vim-fugitive'
+Plugin 'jreybert/vimagit'
 Plugin 'wincent/command-t'
 Plugin 'tmhedberg/SimpylFold'
 Plugin 'vim-scripts/indentpython.vim'
@@ -135,10 +136,12 @@ Plugin 'nvie/vim-flake8'
 Plugin 'jnurmine/Zenburn'
 Plugin 'w0ng/vim-hybrid'
 Plugin 'altercation/vim-colors-solarized'
-Plugin 'kien/ctrlp.vim'
+"Plugin 'kien/ctrlp.vim'
+Plugin 'ctrlpvim/ctrlp.vim'
 "Plugin 'Lokaltog/powerline', {'rtp': 'powerline/bindings/vim/'}
 Plugin 'vim-airline/vim-airline'
 Plugin 'vim-airline/vim-airline-themes'
+Plugin 'ryanoasis/vim-devicons'
 Plugin 'will133/vim-dirdiff'
 Plugin 'jiangmiao/auto-pairs'
 Plugin 'mhinz/vim-startify'
@@ -171,6 +174,7 @@ Plugin 'fisadev/vim-isort'	 " Automatically sort python imports
 Plugin 'klen/python-mode'
 Plugin 'scrooloose/syntastic'
 Plugin 'scrooloose/nerdcommenter'
+Plugin 'sbdchd/neoformat'
 
 Plugin 'luochen1990/rainbow'
 let g:rainbow_active = 1 "0 if you want to enable it later via :RainbowToggle
@@ -185,6 +189,43 @@ filetype plugin indent on    " required
 filetype plugin on
 .
 
+"---------------------------------------
+" Syntastic
+
+" show list of errors and warnings on the current file
+nmap <leader>e :Errors<CR>
+" turn to next or previous errors, after open errors list
+nmap <leader>n :lnext<CR>
+nmap <leader>p :lprevious<CR>
+" check also when just opened the file
+let g:syntastic_check_on_open = 1
+
+" syntastic checker for javascript.
+" eslint is the only tool support JSX.
+" If you don't need write JSX, you can use jshint.
+" And eslint is slow, but not a hindrance
+let g:syntastic_javascript_checkers = ['jshint']
+" let g:syntastic_javascript_checkers = ['eslint']
+
+" syntastic checker for python.
+" let g:syntastic_python_checkers = ["pylint"]
+" let g:syntastic_python_checkers = ["flake8"]
+let g:syntastic_python_checkers = ['prospector']
+let g:syntastic_always_populate_loc_list = 1
+let g:syntastic_auto_loc_list = 1
+let g:syntastic_check_on_open = 1
+let g:syntastic_enable_signs = 1
+
+" don't put icons on the sign column (it hides the vcs status icons of signify)
+let g:syntastic_enable_signs = 1
+
+" custom icons (enable them if you use a patched font, and enable the previous 
+" setting)
+let g:syntastic_error_symbol = '✗'
+let g:syntastic_warning_symbol = '⚠'
+let g:syntastic_style_error_symbol = '✗'
+let g:syntastic_style_warning_symbol = '⚠'
+"----------------------------------------
 
 if has('gui_running')
   set background=dark
@@ -202,6 +243,7 @@ let g:airline#extensions#tabline#enabled = 1
 
 
 
+
 " Nerdcommenter customizations
 " Add spaces after comment delimiters by default
 let g:NERDSpaceDelims = 1
@@ -275,3 +317,4 @@ apt-get install -y python-dev python3-dev
 #apt-get install -y python-pip 
 #pip install jedi
 apt-get install -y vim-python-jedi
+apt-get install -y prospector