Added ABPeoplePickerNavigationController, among other things