fixed compatibility with django 1.6 (django.conf.urls.defaults is gone)
Cleanup and merge