Prepare Redis for Heroku. I think.
Merge branch 'master' of https://github.com/jam-tmrw/teachers

Merge with changes from maser.