Always return the object from update_or_create

Before this change, `update_or_create`ing an existing object with no changes returns `nil`. Now it will always return the object.