Fix a few template references
Merge branch 'master' of github.com:euanlau/django-oscar