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

DTP
Merge pull request #818 from code-dot-org/staging

DTT
Merge pull request #819 from code-dot-org/test

DTP
Decrease cache time to see if that's the cause of the spikes.
Increase cache time for statics to 24 hours.
Merge branch 'test' of github.com:code-dot-org/code-dot-org into staging