Fixes bug in wiki page formating

Addresses bug in last update to the wiki formatter, mentioned in [this comment](https://github.com/alexames/DeltaBot/pull/19#issuecomment-25779975). Additionally, it clears away remnants of the previous merge conflict.

If any other errors in formatting come up let me know and I'll fix them as quickly as I can.