I think these are doing something.
Added diff/mergetool settings for Mac.

- We're using vim again.
- Now all things things in technicolor!