vagrantfile fixes (fwd port to master)

Vagrantfile

@@ -151,6 +151,7 @@ def fs_init(user)
   return <<-EOF
     # clean up (wrong/outdated) stuff we likely got via rsync:
     rm -rf /vagrant/borg/borg/.tox 2> /dev/null
+    rm -rf /vagrant/borg/borg/borgbackup.egg-info 2> /dev/null
     rm -rf /vagrant/borg/borg/__pycache__ 2> /dev/null
     find /vagrant/borg/borg/src -name '__pycache__' -exec rm -rf {} \\; 2> /dev/null
     chown -R #{user} /vagrant/borg