Changes to the email structure and content
Proper argument formatting
Merge pull request #23 from lukecampbell/emails

Changes to the email structure and content