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

DTP
Merge branch 'test' of github.com:code-dot-org/code-dot-org into production
Merge pull request #859 from code-dot-org/staging

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

Update README.md
DTT
DTT, cdo-partners
Merge pull request #862 from code-dot-org/test

DTP