Fix markdown syntax highlighting (use Markdown)

Anew attempt to fix #90 
Also fix garbage from a previous conflict