Xcode 6b7 testing

This PR is a mess, but I think that is OK.

It accurately reflects the state of the Xcode 6 betas.