More changes to cockpit and glib vimrc files