Tidied up a few bits too

Conflicts:
	oscar/apps/basket/urls.py
	oscar/apps/checkout/urls.py
	oscar/apps/checkout/views.py
	oscar/apps/customer/urls.py
	oscar/apps/customer/views.py
	oscar/apps/dynamic_images/__init__.py
	oscar/apps/dynamic_images/response_backends.py
	oscar/apps/product/management/commands/import_images.py
	oscar/apps/product/reviews/urls.py
	oscar/apps/product/urls.py
	oscar/apps/product/utils.py
	oscar/templates/oscar/checkout/checkout.html