Match vim setting overrides if there is no rc file
Merge branch 'fixes-backspace'