Merge branch 'feature/EasyBuild' of github.com:sylmarien/vagrant-vms2 into feature/EasyBuild

Conflicts:
	scripts/Debian/bootstrap.sh
Merge branch 'feature/EasyBuild' of github.com:sylmarien/vagrant-vms2 into feature/EasyBuild

Conflicts:
	scripts/Debian/bootstrap.sh