Set vimdiff as external diff and merge tools
Ensure brew bins override system bins in path