Merge pull request #1091 from RosettaCommons/sboyken/fixing_xcode_postXRW 160211 fixing Xcode issues post-XRW