add /usr/local/bin to PATH for homebrew
update git-diff-wrapper.sh to reflect proper locations of diffmerge