Merge branch 'refactor/redis-config' into calliope
Redis config
Merge pull request #29 from jpkeane/calliope

Calliope
Merge pull request #30 from jpkeane/staging

Staging