move to Xcode 6 beta 3, pull the latest from quick/master, fix compilation issues