Pulling from omnibus

Cherry picking some cool stuff from https://github.com/schisamo/vagrant-omnibus :+1: