remove Vagrantfile + fix leftover from merge