upgrade to xcode 6.1.1

Made a few changes to make this project work in XCode 6.1.1