Add labels to SSH key sections.
Switch from underscore to hyphen.

Hyphens are better for URLs. That is the primary motivation for
switching. We haven't switched any Python scripts to hyphens as this
makes them basically unimportable.
Update todos.