Xcode 6 beta 5 updates

@mikesjewett These are the slight changes required, it has a revert in there because I accidentally committed directly to master