updates for xCode 6 beta 6 release

had to change a boatload of stuff to get it compiling again in xcode 6
beta 6