[Mod] Made the code easier to read/change.
Merge branch 'GSoC014-OHamm-metrics-extra2' into GSoC2014-OHamm-metrics

Conflicts:
	gmetad/data_thread.c
	gmetad/export_helpers.c
	gmetad/gmetad.c
	gmetad/rrd_helpers.c
	lib/gm_scoreboard.h
Merge branch 'GSoC2014-OHamm-metrics' of github.com:OHamm/monitor-core into GSoC2014-OHamm-metrics