changing django.conf.urls.defaults to django.conf.urls
Merge remote-tracking branch 'bolster/develop' into develop