Add fugitive.vim plugin
Merge remote branch 'upstream/master'