Minor deploy cleanup.
Merge remote-tracking branch 'parent/master' into new-theme
Already applied changes to my own templates.
Allow arbitrary tag names.  However if two tags have the same slug they will be merged.
The name of the merged tag will be one of the original names.
However this should not happen in practice.
Merge branch 'tag-names' into new-theme