Markdown into Unstable

Merging new mardown functionality into the unstable branch.