Updated tasks so they run.
merged celery/tasks into master