[merlin] rationalise
[site] split things up so merlin doesn't barf on quite so much
[cam13] renders, albeit incorrectly. cow vs markdown not solved by CDATA