url regex now supports templates with _
Merge branch 'master' of github.com:jneight/django-mail-factory-extras