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

Deploy to production
Merge remote-tracking branch 'origin/master' into staging