Add to contributors lists
Merge branch 'jwhitlock/contrib'

Conflicts:
	CONTRIBUTORS.txt
Merge branch 'master' of github.com:celery/celery
Merge branch 'master' of github.com:celery/celery