updated for vagrant 1.1.

Conflicts:

	README.md
Merge pull request #21 from ryuzee/vagrant-1.0

updated for vagrant 1.1.