Remove vim-gitgutter
Default no-ff for git merge