Merge pull request #1646 from writefreely/email-shortcodes
Refactor: Email Subscription shortcode and form