change django.conf.urls.defaults to django.conf.urls
Merge pull request #11 from sunlightlabs/django1.6

change django.conf.urls.defaults to django.conf.urls
Merge branch 'master' into python3