Update grafana and kaji
Improve influxdb integration
Merge remote-tracking branch 'origin/master'

Conflicts:
	TODO
Added message to README.rst for packages requied to build.
Merge remote-tracking branch 'upstream/master'
Accept changed packages