MacOS fixes

Rearranging the $PATH (should have been this way in the first place, but
only caught the issue via 'brew doctor').

Modifying the git patterns (for the prompt) to play well with the latest
git version from XCode.