Fixing
Merge branch 'master' of https://github.com/rafaeldelucena/vagrant

Conflicts:
	bootstrap.sh