fix for my vim-script ignorance
Merge branch 'master' into supertab-only

* master:
  fix for my vim-script ignorance