Lots of chagnes.
Merge branch 'master' of github.com:stanford-earth/newsletter_templates

Conflicts:
	earthmatters_mailchimp.php