Merge from pixelcog of 'migrate from maruku to kramdown and remove ugly hacks '