Swift Code Modifications after Xcode 6.1 beta 2

- More restrictions on optionals (!?)
- Changes in method signatures