Tweaked the git config to add autosetupmerge, and fixed some paths in my bash_profile