Big checkin for an again working Vagrant box - currently