Xcode 6 adaptions

Xcode 6 adaptions, might still need work bot at least allows for
loading in Xcode 6, might break Xcode 5 support