Hi cuwood.
{custom_field} email merge tag is used for both built-in custom field and Additional Custom Fields addon. When you install and enable ACF addon, built-in custom field gets disabled.
There is no way to insert custom fields individually yet, but this sounds like a good thing to implement. I have created a ticket with this feature request in our support system.