Fix Mac Deploy scripts for newer Xcode and git