Add Easier merging of Xcode project files post
Fix a few issues in the Xcode script post