Tagged Block Templates

To make it easier to identify what block template was used in a block,
I've added a comment tag to all the HTML templates.  If we need to
update a block everywhere, we can do that just by updating rows that
match that comment in the html template.