Updates to satisfy Xcode6-Beta4, which fixed the framework/module problem.