Add support for kwargs
Merge branch 'master' of github.com:jameh/celery