Merge remote-tracking branch 'hogepodge/autoconfig_wip' into temp

Conflicts:
	manifests/role/allinone.pp
Using modules from /vagrant