Remove debug print from riemann plugin
Merge branch 'riemann-plugin' into debian-package

Conflicts:
	src/riemann.c