riemann: Add a cpu-average/cpu-used metric

Calculate cpu-average/cpu-used from cpu-user and cpu-system, and display
it on the dashboard. Also on the dashboard, the "CPU over time" graph
was simplified to only show the combined value.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>