Add email optIn to add_contact_with_dup_check

Since it's in both add and update, it seems to make sense.

Also, I changed the variable names to match in those methods.