Changes from maruku to rdiscount for template processing