added gvim setup for gui only
Merge branches 'osx-gui' and 'linux-server' into linux-server