Update for iOS 8.1, remove deprecated NSCalendarUnits