Merge pull request #3717 from milkey-mouse/fix-3706-fp1.2

Vagrant: move cleanup steps to fs_init (1.2 forward-port)

Vagrantfile

@@ -85,9 +85,6 @@ def install_borg(fuse)
     . borg-env/bin/activate
     pip install -U wheel  # upgrade wheel, too old for 3.5
     cd borg
-    # clean up (wrong/outdated) stuff we likely got via rsync:
-    rm -rf __pycache__
-    find src -name '__pycache__' -exec rm -rf {} \\;
     pip install -r requirements.d/development.txt
     python setup.py clean
   EOF
@@ -152,6 +149,10 @@ end
 
 def fs_init(user)
   return <<-EOF
+    # clean up (wrong/outdated) stuff we likely got via rsync:
+    rm -rf /vagrant/borg/borg/.tox
+    rm -rf /vagrant/borg/borg/__pycache__
+    find /vagrant/borg/borg/src -name '__pycache__' -exec rm -rf {} \\;
     chown -R #{user} /vagrant/borg
     touch ~#{user}/.bash_profile ; chown #{user} ~#{user}/.bash_profile
     echo 'export LANG=en_US.UTF-8' >> ~#{user}/.bash_profile