Merge remote-tracking branch 'remotes/ogetto/master'

Conflicts:
	Vagrantfile
Merge remote-tracking branch 'origin/master'