Remove typo'd Riemann plugin from default
Reorg, manage config via node attribs, other fixes.