Use URLs from future in templates.
Use simplejson instead of django.utils.simplejson.
Remove django.contrib.markup. (We included it from the templates, but didn't even use it?)
Merge update for django 1.5
Merge update for django 1.5
Merge update for django 1.5
Merge updates for django 1.5