Merge the instructions into one, avoiding the need for vim

Closes: https://openhatch.org/bugs/issue803