Added some wikitext parsing
Merge branch 'master' of https://github.com/emmerich/thrifty-api