thinking of wiki

I continue to expand the code for indeepthought and have implemented more of wiki markup. If your curious about wiki markup you can see two competing standards here and here. Which one am I using? Neither really, there are parts of both I don't like and since neither is an excepted standard by the community of wiki I am basically using my own derived form based off wikipedia itself.