Django 1.4 urls
Merge Django 1.4 upgrade