Fixes test for #1964
Wording
Adds celery.version_info_t
Fix for QoS when using RabbitMQ 3.3 or later.  (Issue celery/kombu#339)
Add my name to contributors
Merge pull request #1983 from mduggan/worker-heartbeat-option

Add my name to contributors
Merge branch 'master' into bmbouter-1973

Conflicts:
	CONTRIBUTORS.txt