Fix flow of Expiry for APNS templates and ensure Expiry and TemplateName can be round-tripped or passed through for all template registrations
Allow payload to be string or object
Correct trailing white-space issues
Merge pull request #1130 from toddreifsteck/dev

Template registration improvements