Update scripts to work with XCode 6.1 on Yosemite with GitHub changes