Fix regression that caused template delimiter options to be ignored
Merge branch 'master' of github.com:collectiveaccess/providence