Merge branch 'develop'
Merge branch '131-fix-broken-email-guidance'
Move survey link to bottom of email.

We've had several annoyed responses where people think we're just
sending them the same link over and over as they don't see the rest of
the mail.
Merge branch 'master' into develop