Display template processing fixes
Merge branch 'master' of github.com:collectiveaccess/providence