Ensure Vagrant does not stop on non-fatal errors
Merge master branch

Conflicts:
	Vagrantfile