Use config password (Not Vagrant recommended)
Merge branch 'master' of https://github.com/philcallister/kitchen-vagrant

Conflicts:
	templates/Vagrantfile.erb