diff --git a/bundles-init/nerdtree.cfg.vim b/bundles-init/nerdtree.cfg.vim
index 0036dcc..326f4b5 100644
--- a/bundles-init/nerdtree.cfg.vim
+++ b/bundles-init/nerdtree.cfg.vim
@@ -1,4 +1,5 @@
 " NERDTree: ' e' = toggle side bar
+let g:NERDTreeUpdateOnWrite = 1
 nnoremap <Leader>e :NERDTreeToggle<CR>
 
 " Open automatically if there are more than 150 columns and no file was specified
diff --git a/bundles-init/vim-fugitive.cfg.vim b/bundles-init/vim-fugitive.cfg.vim
new file mode 100644
index 0000000..8cb1a52
--- /dev/null
+++ b/bundles-init/vim-fugitive.cfg.vim
@@ -0,0 +1,13 @@
+" Fugitive commands that don't require interaction with GitGutter or NERDTree
+nnoremap <silent> <Leader>gd :Gdiff<cr>
+nnoremap <silent> <Leader>gs :Gstatus<cr>
+nnoremap <silent> <Leader>gl :Silent Glog<cr>:bot copen<cr>
+nnoremap <silent> <Leader>gc :Gcommit -q<cr>
+nnoremap <Leader>gb :Git branch<space>
+
+" Note: dangerous commands don't have a <cr>
+nnoremap <Leader>gB :Git checkout -b<space>
+nnoremap <Leader>gC :Git checkout<space>
+nnoremap <Leader>gM :Gmove<space>
+nnoremap <Leader>gP :Git push<space>
+nnoremap <Leader>gR :Gremove
diff --git a/bundles-init/vim-fugitive.load.vim b/bundles-init/vim-fugitive.load.vim
new file mode 100644
index 0000000..09403d1
--- /dev/null
+++ b/bundles-init/vim-fugitive.load.vim
@@ -0,0 +1 @@
+NeoBundle 'tpope/vim-fugitive'
diff --git a/bundles-init/vim-gitgutter.cfg.vim b/bundles-init/vim-gitgutter.cfg.vim
new file mode 100644
index 0000000..daf6b71
--- /dev/null
+++ b/bundles-init/vim-gitgutter.cfg.vim
@@ -0,0 +1,23 @@
+function! <SID>RunGitOp(op)
+	execute "Silent" a:op
+	GitGutter
+	
+	let wins = filter( range( 1 , winnr( '$' ) ) ,
+		\ "buffer_name(winbufnr(v:val)) =~ '^NERD_tree_[0-9]\\+$'" )
+	if empty( l:wins )
+		return
+	endif
+
+	let wn = winnr()
+	call NERDTreeFocus()
+	call feedkeys( "R:" . l:wn . "wincmd w\<cr>:\<esc>" , 't' )
+endfunction
+
+
+let g:gitgutter_map_keys = 0
+nnoremap <silent> <Leader>g< :GitGutterPrevHunk<cr>
+nnoremap <silent> <Leader>g> :GitGutterNextHunk<cr>
+nnoremap <silent> <Leader>g+ :call <SID>RunGitOp( 'GitGutterStageHunk' )<cr>
+nnoremap <Leader>g- :GitGutterRevertHunk
+
+nnoremap <silent> <Leader>ga :call <SID>RunGitOp( 'Git add %:p' )<cr>
diff --git a/bundles-init/vim-gitgutter.load.vim b/bundles-init/vim-gitgutter.load.vim
new file mode 100644
index 0000000..edacfe2
--- /dev/null
+++ b/bundles-init/vim-gitgutter.load.vim
@@ -0,0 +1 @@
+NeoBundle 'airblade/vim-gitgutter'
diff --git a/doc/heavim.txt b/doc/heavim.txt
index 750c19b..63915e2 100644
--- a/doc/heavim.txt
+++ b/doc/heavim.txt
@@ -42,3 +42,21 @@ local leader key.
 
    <Leader>t            Toggle tagbar
    <Leader>e            Toggle NERDtree explorer
+
+   <Leader>gd           Git: view diff for current buffer
+   <Leader>gl           Git: show log
+   <Leader>gs           Git: show status
+   <Leader>g<           Git: previous modified chunk
+   <Leader>g>           Git: next modified chunk
+
+   <Leader>g+           Git: add modified chunk
+   <Leader>g-           Git: revert modified chunk
+   <Leader>ga           Git: add whole buffer
+   <Leader>gb           Git: create branch
+   <Leader>gc           Git: commit staged changes
+
+   <Leader>gB           Git: create and checkout branch
+   <Leader>gC           Git: checkout
+   <Leader>gM           Git: rename current buffer
+   <Leader>gP           Git: push
+   <Leader>gR           Git: remove current buffer