do not try to add user to mailchimp list if they don't have an email
Merge remote-tracking branch 'upstream/master'