Urls import fix for Django 1.6+

We should use `django.conf.urls` instead of `django.conf.urls.defaults` in Django 1.6 and on.
*(Sorry, this PR contains a harmless old already merged commit too.)*