Make hostname and hostname_method available
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/stuartbfox/garethr-diamond into stuartbfox-master

Conflicts:
	manifests/config.pp
	manifests/init.pp