Tweaks to work with newest Mac

Removed hack for __git_ps1