django.conf.urls.defaults is deprecated

Using a failsafe from django.conf.urls import *
Merge remote-tracking branch 'parent/master'