removing redis
Merge branch 'master' into poet

Conflicts:
	package.json