fix rabbitmq buildout breakage
Merge branch 'celery' into socketio

Conflicts:
	buildout.cfg
Merge branch 'socketio' into termjs