a couple of more modifications
Merge remote-tracking branch 'origin/master'

Conflicts:
	manifests/graphite_packages.pp
	manifests/init.pp