Fix test_local_overrides.vim test broken by better-gradient branch
Merge branch 'fix-vim-overrides-test' into develop