Roll changes for Xcode5 back into Xcode4 version of compiler plugin