Added Fugitive.vim - resolving merge conflicts with vimdiff