Various changes
Merge branch 'master' of https://github.com/rchrd/mesosphere

Conflicts:
	Vagrantfile