Merge branch 'develop'. Minor cleanups.
Merge branch 'develop'
Merge branch 'fixin'. Add support for riemann and carbon.
Fix mistype in gmetad.template