Refs #16. Added Celery 2.5 compatibility.