Use the new behaviour for the url tag

https://docs.djangoproject.com/en/dev/releases/1.3/#changes-to-url-and-ssi
Merge branch 'work'