Fixed regressions that could cause display template tags to fail
Merge branch 'master' of github.com:collectiveaccess/providence