[git] mergetool with vim, improved colors, cleaner gitignore