PROV-964 clean up templates; add option for label border outlines
Merge branch 'develop' of github.com:collectiveaccess/providence into develop