Merge pull request #214 from code-dot-org/staging

DTT
Merge pull request #220 from code-dot-org/staging

DTT
Merge pull request #221 from code-dot-org/test

DTP
Hotfix for sending emails - better handling of malformed name fields
Merge branch 'test' into staging