Merge branch 'master' of git://github.com/adrahon/vagrant-kvm into specs

Conflicts:
	README.md