Fixes for Beta 5
Revert "Fixes for Beta 5"

This reverts commit aea097770ebb2ba1f54c5262509cd9e87eb68c01.
Fixes required for Beta 5
Merge pull request #3 from Bloc/xcode-6-beta-5-updates

Xcode 6 beta 5 updates