xinitrc: Check if we're running inside a VirtualBox VM, and if so, run VBoxClient
[Vim] Merge in upstream change (file path fix)