Put /usr/local/bin at the front of path.
A couple of git aliases.
Mergetool config etc:

- use newer vim version
- configure three way merge
- autocrlf = input