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

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

DTP
Update 2 at a time with our smaller set of instances in play now.
Leaderboard for cities.
Merge branch 'production' of github.com:code-dot-org/code-dot-org into test
Merge branch 'test' of github.com:code-dot-org/code-dot-org into staging