update readme
Merge branch 'master' of github.com:crazysim/salty-vagrant-vm

Conflicts:
	README.md