fix markdown
Merge branch 'fix-markdown' into candidate

If I'd been following my own advice I'd have checked that candidate was
working properly before merging to master.
Add note about lifetime of topic branches
Merge branch 'when-to-rm-topic-branch' into candidate
Merge branch 'candidate'