This should bring the repo up to date with the april 22 changes
test for xcode/git compatability