Update for Xcode 6.1 and Swift 1.1