Sync with the 'master' branch:
[vim] removed duplicated/unused settings / overall cleanup