Switch a little of the html generation to jinja2
Updates to the catalog&server design documents
Round of updates to blaze-catalog.md
Improve invalid promotion error message
Improve promotion errors