updates for 24.4, and disabling vc-mode
merged