Integrate Kate's latest edits to ms.rmd