Add to contributors lists
flake8 fixes
Update CONTRIBUTORS.txt
Fixed MultiTool test case

Updated the test case to match the change introduced in
085af4bb31d6a8049061649bb179231777a1ad9b.
Improves reference for CELERY_QUEUES.  Closes #2231
Periodic task examples too easily confused
Adding missing instruction on necessary path for RabbitMQ
Merge pull request #2242 from jonathan-s/master

Adding missing instruction on necessary path for RabbitMQ
Merge pull request #2213 from ocean1/patch-1

Added myself as a contributor
Merge branch 'jwhitlock/contrib'

Conflicts:
	CONTRIBUTORS.txt
Merge pull request #2210 from dnaeon/flake8-fixes

flake8 fixes
Merge branch 'master' of github.com:celery/celery
Merge pull request #2223 from ginoledesma/multi-test-fixup

Fixed MultiTool test case
Merge branch 'master' of github.com:celery/celery
Result: .get() should not call get_task_meta after receiving the result.  Closes #2245
Fixes problem with propagate in last commit
Django: Always call django.setup() before task modules imported.  Closes #2227
Fixes tests
Fixes mongodb tests.  Closes #1964
fixed tox.ini -- added missed comma