Keeping up with the upstream repo

Hopefully this gets things working in Xcode 6.