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

DTP
daemon should never be a canonical name
For email blash.
Merge branch 'production' into test