rejiggle subject ordering
Merge pull request #221 from HubSpot/better_email_subjects

rejiggle subject ordering