fix typo
change "from django_project.settings" to correct "from django.conf import settings" to allow override of the settings via the DJANGO_SETTINGS_MODULE environment
use django1.5+ url style from future for the templates
Merge branch 'master' into feature/ansible