Tests passing

Conflicts:
	celery/app/base.py
	celery/tests/app/test_app.py