Added backwards compatibility to new tag system
Added $payment_id to apply_filter for backwards compatibility
Using new template tag function

Replace edd_email_template_tags with edd_do_email_tags