Merge upstream changes from WP By Email

Brings in up to feaca68ede
Add a per site name to notification emails