Move wikimarkdown def here and add image support