updated for vagrant 1.1.

Conflicts:

	README.md