add a dummy NotifierRefMinxin
fix bug where duplicate templates were being created if you edited the template
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into features/hstore and tidy up some spelling and other small issues

Conflicts:
	notifier_templates/models.py