upgraded to celery 3.1 correctly, fixed some issues