vim: update vundle and clean vimrc

vim/vimrc

@@ -10,38 +10,28 @@ if filereadable(expand("$HOME/.vim/bundle/vundle/README.md"))
 
     " let Vundle manage Vundle
     " required!
-    Bundle 'gmarik/vundle'
+    Plugin 'gmarik/vundle'
 
-    Bundle 'xolox/vim-misc'
+    Plugin 'xolox/vim-misc'
-    Bundle 'xolox/vim-session'
+    Plugin 'xolox/vim-session'
-    Bundle 'vim-ruby/vim-ruby'
+    Plugin 'vim-ruby/vim-ruby'
-    Bundle 'tpope/vim-rails'
+    Plugin 'tpope/vim-rails'
-    Bundle 'tpope/vim-haml'
+    Plugin 'tpope/vim-haml'
-    Bundle 'tpope/vim-markdown'
+    Plugin 'tpope/vim-markdown'
 
-    " snipMate dependencies
+    Plugin 'Sirver/ultisnips'
-    Bundle "MarcWeber/vim-addon-mw-utils"
+    Plugin 'honza/vim-snippets'
-    Bundle "tomtom/tlib_vim"
-    Bundle "honza/vim-snippets"
 
-    "Bundle "garbas/vim-snipmate"
+    Plugin 'ton/vim-bufsurf'
+    Plugin 'AndrewRadev/switch.vim'
 
-    Bundle 'goldfeld/vim-seek'
+    Plugin 'airblade/vim-gitgutter'
-    Bundle 'Lokaltog/vim-easymotion'
+    Plugin 'tpope/vim-fugitive'
-    Bundle 'ton/vim-bufsurf'
+    Plugin 'scrooloose/syntastic'
-    Bundle 'Yggdroot/indentLine'
-    Bundle 'AndrewRadev/switch.vim'
 
-    Bundle 'airblade/vim-gitgutter'
+    Plugin 'Gundo'
-    Bundle 'tpope/vim-fugitive'
+    Plugin 'The-NERD-Commenter'
-    Bundle 'scrooloose/syntastic'
+    Plugin 'VisIncr'
-
-    Bundle 'Gundo'
-    Bundle 'The-NERD-tree'
-    Bundle 'The-NERD-Commenter'
-    Bundle 'closetag.vim'
-    Bundle 'taglist.vim'
-    Bundle 'VisIncr'
 endif
 " }
 
@@ -81,8 +71,6 @@ set noincsearch
 set noshowmatch
 set colorcolumn=80
 
-set winwidth=100
-
 set listchars=nbsp:·,tab:▸\ ,extends:>,precedes:<
 set list
 
@@ -142,16 +130,13 @@ set foldopen-=undo
 map <F1> <ESC>
 imap <F1> <ESC>
 
-map <F3> <ESC>:NERDTreeToggle<CR>
-map <F4> <ESC>:Tlist<CR>
 map <F5> <ESC>:GundoToggle<CR>
 
-nnoremap <silent> gy :Switch<CR>
-
 map <F11> :!ctags -R --c++-kinds=+p --fields=+iaS --extra=+q .<CR>
-" Rot13
 map <F12> ggg?G
 
+nnoremap <silent> gy :Switch<CR>
+
 nnoremap <silent> ,bp :bprevious<CR>
 nnoremap <silent> ,bf :bnext<CR>
 nnoremap <silent> ,Bp :BufSurfBack<CR>
@@ -164,10 +149,11 @@ nnoremap <leader>d "_d
 " PLUGINS
 " {
 " gitgutter
-let g:gitgutter_on_bufenter = 0
+let g:gitgutter_realtime = 0
-let g:gitgutter_all_on_focusgained = 0
+let g:gitgutter_eager = 0
-" numbertoggle
+" UltiSnips
-let g:NumberToggleTrigger = "<leader>r"
+let g:UltiSnipsExpandTrigger="<tab>"
+let g:UltiSnipsJumpForwardTrigger="<tab>"
 " Session
 let g:session_autoload = 'no'
 let g:session_autosave = 'no'
@@ -177,19 +163,6 @@ if !filewritable(expand(g:session_directory))
     call mkdir(expand(g:session_directory), "p")
 endif
 
-
-" closetag
-autocmd FileType html,htmldjango,jinjahtml,eruby,mako let b:closetag_html_style=1
-autocmd FileType html,xhtml,xml,htmldjango,jinjahtml,eruby,mako source ~/.vim/bundle/closetag.vim/plugin/closetag.vim
-
-" TagList : http://vim-taglist.sourceforge.net/
-" Need ctags
-" :help taglist
-let Tlist_Ctags_Cmd="ctags"
-
-" Doxygen
-let g:DoxygenToolkit_authorName="Guillaume DOTT"
-
 autocmd FileType ruby let b:switch_custom_definitions =
     \ [
     \   {
@@ -245,4 +218,6 @@ highlight clear SignColumn
 au BufWinEnter * let w:m2=matchadd('ErrorMsg', '\s\+$', -1)
 " autocmd BufWrite * silent! %s/[\r \t]\+$//
 
+"autocmd WinLeave * :call FocusLost()
+"autocmd WinEnter * :call FocusGained()
 " }