django.conf.urls made compatible with Django1.6
Merge branch 'master' of https://github.com/leetncamp/django_insertwiki