Updated for Xcode6-Beta4

Was also able to fix a few issues, due to bugfixes in Swift itself.