Change CPU on VM
Started reworking vm to use the mesosphere.io packages, plus erlang, compilers and git
Merge branch 'master' of https://github.com/mdevilliers/vagrant-mesos-development-environment

Conflicts:
	provision.sh