Xcode 6 Beta 7 Swift changes

As the commit message says I fixed some of the errors due to changes in Xcode 6 Beta 7. Running the tests crash Xcode 6, it looks like a problem on Apples end. Not sure though, it would be nice to see if anyone else had any success.