better structuring of site templates (from uwacsp:dglance-site-templates)

This is a cleaner branch meant to supplant #2189.  See that PR for discussion.  Assigning to @jbau to be another set of testing eyes, as we discussed in planning today.