Debugging with blocking detection
Merge branch '3.0'

Conflicts:
	celery/__init__.py
	celery/app/annotations.py
	celery/app/builtins.py
	celery/app/utils.py
	celery/apps/worker.py
	celery/backends/base.py
	celery/bin/base.py
	celery/bin/celery.py
	celery/bin/multi.py
	celery/canvas.py
	celery/contrib/rdb.py
	celery/loaders/base.py
	celery/result.py
	celery/task/http.py
	celery/utils/__init__.py
	celery/utils/log.py
	celery/utils/mail.py
	celery/utils/text.py
	celery/utils/timer2.py
	celery/worker/control.py
	celery/worker/hub.py
Merge branch '3.0'

Conflicts:
	celery/app/task.py
	celery/bin/celery.py
	celery/canvas.py
	celery/contrib/rdb.py
Add Theo Spears to contributors.txt
Merge pull request #1265 from theospears/patch-2

Add Theo Spears to contributors.txt
Merge branch '3.0'
4+4=8

Just making the tutorial flow as if the user was following this directly.
Merge pull request #1271 from rgbkrk/patch-1

4+4=8
Merge branch '3.0'
ConfigurationView (hence Settings) is a MutableMapping
Merge branch '3.0'

Conflicts:
	celery/datastructures.py
Merge branch '3.0'

Conflicts:
	celery/datastructures.py
Removes leftover comment
Adds my twitter
Adding Aaron Harnly to CONTRIBUTORS.txt
Merge branch 'master' of github.com:celery/celery
statedb: use best pickle protocol
Add Romuald Brunet to CONTRIBUTORS.txt
celery crashes on git pull

If tasks.py file is modified in git repository and I run git pull on server, then celery crashes.

"Git pull" first removes the file and then restores it, but pyinotify catches removal event.

I updated _maybe_modified function to first verify if file exists and if not then mark file as "unmodified", because afterwards will be another event when file is recreated.
Update monitoring.rst

fixed the doc on how to change flower port.
Added information on how to connect to a distant broker.

Informations found on https://github.com/mher/flower#usage,
I thought it was useful to have it in this doc too,
as it is quite necessary for the flower use.