Remove all use of django.conf.urls.defaults since we don't support Django 1.3 anymore.
Merge remote-tracking branch 'upstream/master' into checkout_step_discovery
Forget checkout step every time the cart is shown.