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

DTP
Merge pull request #658 from code-dot-org/test

DTP
Merge pull request #665 from code-dot-org/test

DTP
Fix unsubscribers script.
Merge branch 'production' of github.com:code-dot-org/code-dot-org into test