working vim state for non-server role
Merge branch 'server' into m