[vim] cleanup
[vim] disabled mouse navigation support
[git] use vimdiff as external diff tool
[vim] add "splice" plugin for 3-way merge conflict resolution in git
[git] use splice (vim plugin) to resolve merge conflicts
[git] alias (dif) to built-in diff without external tool