Rename README.md to README.adoc
Convert to AsciiDoc format
merge
Add back michaelneale's changes lost in the merge