every machine should recognise itself at 127.0.0.1, unless an alternative hosts array is defined for /etc/hosts
Merge branch 'master' of github.com:devopera/puppet-docommon

Conflicts:
	README.md