[git] mergetool with vim, improved colors, cleaner gitignore
[tmux] disable tmux mouse mode