fix test for disabling trophies
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging
Merge pull request #793 from code-dot-org/staging

DTT to sync up the branches