Add vim-fugitive and vim-unimpaired
Remove diffconflicts from .vimrc
Add vim-fugitive settings in .vimrc