Update grafana/adagios/kaji packages
Add vagrant file
Add missing files to the last commit
Update Adagios and kaji packages
Fix kaji package
Update TODO and Dockerfile
Merge remote-tracking branch 'upstream/master'

Conflicts:
	packages/grafana
	packages/kaji