[GIT] Instruct mergetool to keep a backup
[VIM] Removes obsolete keybindings