Base vagrant set up with puppet
Merge branch 'master' of github.com:christopherrolfe198/imagen

Conflicts:
	.gitignore