removed redis from devel
cleaned up devel
Merge branch 'devel' into feature/sgejob

Conflicts:
	MANIFEST.in
	setup.py