Changing addObject to addOrUpdateObject, using Mantle's mergeValuesForKeysFromModel stuff