fixing ubuntu box version
Merge branch 'master' of github.com:rackerlabs/vagrant-solum-dev

Conflicts:
	Vagrantfile