Django 1.4 url imports
Merge Django 1.4 upgrade