Simple changes supporting more MarkDown hackery (this will get better, I swear)