Cleaned up project for Xcode5/ios7