adding vim-fugitive for git goodness
fixing diverged local master