Merge branch 'AnthroConWIP' of github.com:magfest/ubersystem-deploy into AnthroConWIP

Conflicts:
	puppet/hiera/vagrant-1.yaml
no idea
remove puppi
clear local conflicts