Updated for Xcode 6.1 & new version of Swift

Unfortunately Apple had introduced breaking changes - now corrected.

Signed-off-by: Gemma Barlow <gemma@harrys.com>