Now respects database choice, and listens only on specific queues

Conflicts:
	Rakefile
Cleanup