Upgrade to 1.6, change django.conf.urls and django.views.generic