Edits vagrant files to move to master branch
From now on, there will only be one branch
Merge branch 'vagrant'

* vagrant:
  Edits vagrant files to move to master branch From now on, there will only be one branch

Conflicts:
	Vagrantfile
	bootstrap.sh