Fixed a few errors with Xcode 6.1 beta 3.
Merge CLKit changes.