gvim tweaking
Merge branch 'gvim'