Merged celery and other recent goodies to API master