redis coherency in supervisord
Merge branch 'develop' of https://github.com/ImaginationForPeople/assembl into virtuoso

Conflicts:
	assembl/scripts/ini_files.py