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

DTP
Added indexes.
Merge branch 'test' into staging