Updated for Xcode 6.1

Mostly failable initialisers