Update for Beta 6

Changes to compile with the current Xcode 6 beta, beta 6. 

I'm not sure if the change in `==` for `Maybe` matches the old functionality, so take a hard look at it.