Merge pull request #324 from code-dot-org/test

DTP
DTP for email
Email tweaks
Hotfix for PD emails
Merge branch 'production' of github.com:code-dot-org/code-dot-org into production
Merge branch 'production' into test
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging