Add myself to Contributors (pull request 1142)
Fixes pickling of configuration modules when using execv/fork emulation.  Closes #1126
Use the now() from the underlying schedule in ScheduleEntry

If a schedule defines a custom nowfun, then the ScheduleEntry should use that instead of the app default
Add countdown option for chord unlock.  Closes #1146
tests passing
Adds Jun Sakai (jsakai) to CONTRIBUTORS.txt
Removes usage of panel.logger.  Closes #1160
Merge pull request #1158 from SplunkStorm/3.0-add-author

Adds Jun Sakai (jsakai) to CONTRIBUTORS.txt
Adds Jun Sakai (jsakai) to CONTRIBUTORS.txt
Fixes bug in TaskProducer (deprecated class)
Adds setting to modify the heartbeat monitor rate: BROKER_HEARTBEAT_CHECKRATE
Merge branch 'master' of github.com:celery/celery
Merge branch '3.0'

Conflicts:
	celery/app/base.py
	celery/app/utils.py
	celery/backends/base.py
	celery/worker/consumer.py
Changes "command-line" -> "command line"
amqp backend: polling now uses message.requeue instead of republishing
contextmanagers that needs finally
Merge branch '3.0'

Conflicts:
	celery/backends/amqp.py
	celery/bin/base.py
	celery/tests/tasks/test_http.py
	celery/tests/utils.py
	docs/history/changelog-2.1.rst
	docs/userguide/monitoring.rst