Switched to vim-plug

.vimrc

@@ -1,60 +1,60 @@
-" Vundle setup
-set nocompatible               " be iMproved
-filetype off                   " required!
-
 " set the runtime path to include Vundle and initialize
 "call has('python3')
-set rtp+=~/.vim/bundle/Vundle.vim
-call vundle#begin()
 
-" let Vundle manage Vundle, required
+" Start plugins
-Plugin 'VundleVim/Vundle.vim'
+call plug#begin('~/.vim/plugged')
-
-" Vundle bundles
 " Javascript
-Plugin 'pangloss/vim-javascript'
 
-" Plugin 'jelera/vim-javascript-syntax' " Replaced by yajs.vim
+" Plug 'jelera/vim-javascript-syntax' " Replaced by yajs.vim
-Plugin 'nathanaelkane/vim-indent-guides'
+Plug 'pangloss/vim-javascript',         {'for': 'javascript'}
-Plugin 'othree/yajs.vim'
+Plug 'nathanaelkane/vim-indent-guides', {'for': 'javascript'}
-Plugin 'gavocanov/vim-js-indent'
+Plug 'othree/yajs.vim',                 {'for': 'javascript'}
-Plugin 'digitaltoad/vim-jade'
+Plug 'gavocanov/vim-js-indent',         {'for': 'javascript'}
-Plugin 'othree/es.next.syntax.vim'
+Plug 'digitaltoad/vim-jade',            {'for': 'javascript'}
-Plugin 'othree/jsdoc-syntax.vim'
+Plug 'othree/es.next.syntax.vim',       {'for': 'javascript'}
-Plugin 'othree/html5.vim'
+Plug 'othree/jsdoc-syntax.vim',         {'for': 'javascript'}
-Plugin 'heavenshell/vim-jsdoc'
+Plug 'othree/html5.vim',                {'for': 'javascript'}
-Plugin 'othree/javascript-libraries-syntax.vim'
+Plug 'heavenshell/vim-jsdoc',           {'for': 'javascript'}
-Plugin 'moll/vim-node'
+Plug 'othree/javascript-libraries-syntax.vim', {'for': 'javascript'}
-"Plugin 'ternjs/tern_for_vim'
+Plug 'moll/vim-node',                   {'for': 'javascript'}
+Plug 'ternjs/tern_for_vim',             {'for': 'javascript'}
+
+" C/C++
+"Plug 'majutsushi/tagbar'
 
 " Syntax checking
-Plugin 'Valloric/YouCompleteMe'
+Plug 'Valloric/YouCompleteMe'
-Plugin 'scrooloose/syntastic'
+Plug 'scrooloose/syntastic'
 
 " Useful plugins
-Plugin 'Raimondi/delimitMate'
+Plug 'Raimondi/delimitMate'
-Plugin 'scrooloose/nerdcommenter'
+Plug 'scrooloose/nerdcommenter'
-Plugin 'scrooloose/nerdtree'
+Plug 'scrooloose/nerdtree'
-Plugin 'jlanzarotta/bufexplorer'
+Plug 'jlanzarotta/bufexplorer'
-Plugin 'ctrlpvim/ctrlp.vim'
+Plug 'ctrlpvim/ctrlp.vim'
+
+" Snippets
+Plug 'sirver/ultisnips'
+Plug 'honza/vim-snippets'
 
 " Themes
-"Plugin 'Lokaltog/vim-distinguished'
+"Plug 'Lokaltog/vim-distinguished'
-Plugin 'altercation/vim-colors-solarized'
+"Plug 'altercation/vim-colors-solarized'
-"Plugin 'tomasr/molokai'
+"Plug 'tomasr/molokai'
-"Plugin 'flazz/vim-colorschemes'
+"Plug 'flazz/vim-colorschemes'
-Plugin 'morhetz/gruvbox'
+"Plug 'morhetz/gruvbox'
-Plugin 'chriskempson/base16-vim'
+Plug 'chriskempson/base16-vim'
 
 " Airline
-Plugin 'vim-airline/vim-airline'
+Plug 'vim-airline/vim-airline'
-Plugin 'vim-airline/vim-airline-themes'
+Plug 'vim-airline/vim-airline-themes'
+
 let g:airline_theme='base16_default'
 let g:airline_powerline_fonts = 1
 
-" All of your Plugins must be added before the following line
+" Initialize plugin system
-call vundle#end()            " required
+call plug#end()
-filetype plugin indent on    " required
+filetype plugin indent on
 
 " Other
 set t_Co=256
@@ -181,7 +181,8 @@ inoremap <C-t>     <Esc>:tabnew<CR>
 " YouCompleteMe
 let g:ycm_add_preview_to_completeopt=0
 let g:ycm_confirm_extra_conf=0
-"let g:ycm_global_ycm_extra_conf = '~/.ycm_extra_conf.py'
+let g:ycm_global_ycm_extra_conf = '~/.ycm_extra_conf.py'
+
 set completeopt-=preview
 set ssop-=options    " do not store global and local values in a session
 set ssop-=folds      " do not store folds
@@ -201,13 +202,15 @@ let g:syntastic_check_on_open = 1
 let g:syntastic_check_on_wq = 0
 let g:syntastic_javascript_checkers = ['eslint']
 
+map <F12> :GoTo<CR>
+
 " Toggle number
 :nmap <C-N><C-N> :set invnumber<CR>
 
 " Toggle hlsearch
 :nnoremap <silent> <Space> :nohlsearch<Bar>:echo<CR>
 autocmd BufRead,BufNewFile *.es6 setfiletype javascript
-map <F12> :%!tidy -q --tidy-mark 0 2>/dev/null<CR>
+"map <F12> :%!tidy -q --tidy-mark 0 2>/dev/null<CR>
 
 " Configure for jsdoc
 let g:jsdoc_enable_es6 = 1
@@ -222,4 +225,9 @@ set expandtab
 set shiftwidth=2 
 set smarttab
 
+autocmd Filetype python setlocal ts=4 sw=4 sts=0 expandtab
 autocmd Filetype cpp setlocal ts=4 sw=4 sts=0 expandtab
+
+let g:UltiSnipsExpandTrigger="<c-tab>"
+let g:UltiSnipsJumpForwardTrigger="<c-b>"
+let g:UltiSnipsJumpBackwardTrigger="<c-z>"