separate VM building into pieces, update for yosemite