Wiki parser

Merging in work done for the wiki parser