Updated for xcode6-beta5


This contains syntax changes to get it to compile under xcode6-beta5.  Minor stuff.