Add redis
Merge branch 'master' into redis

Conflicts:
	requirements.txt
Configure redis