updated with pull requests for celery 3.0 and people event