update VagrantFile to use puppet modules and the hieradata file
Merge branch 'master' of github.com:pablocrivella/rails-apps-dev-box

Conflicts:
	README.md