Updated for gvim under Ubuntu