Merge branch 'master' of ssh+git://barakmich.com/fs/home/barak into homedir

.gitconfig

@@ -8,9 +8,10 @@
   ci = commit
   co = checkout
   w = whatchanged
+  revert = checkout -f
   stagediff = diff --staged
   sdiff = diff --staged
-    graph = log –graph –oneline
+  graph = log --graph --oneline
 
 [diff]  
   renamelimit = 0

.vimrc

@@ -73,6 +73,12 @@ let g:NERDChristmasTree = 1
 let g:NERDChristmasTree = 1
 let g:NERDTreeQuitOnOpen = 1
 let g:NERDTreeWinPos = "right"
+
+" Tagbar plugin settings
+let g:tagbar_width = 40
+let g:tagbar_autofocus = 1
+
+" Taglist plugin settings (deprecated)
 let Tlist_GainFocus_On_ToggleOpen = 1
 let Tlist_Use_Right_Window = 1
 let Tlist_Inc_Winwidth = 0
@@ -101,7 +107,7 @@ au BufEnter *.org            call org#SetOrgFileType()
 "nnoremap gn gt
 "nnoremap gp gT
 nmap gt :NERDTreeToggle<CR>
-nmap gT :TlistToggle<CR>
+nmap gb :TlistToggle<CR>
 "nnoremap gx :Kwbd<CR>
 nnoremap gc :Kwbd<CR>
 "nnoremap gc :bdelete<CR>