Merge pull request #159 from apple/revert-158-master

Revert "Rename Predicate to NSPredicate"