cleaned up conflicts betweed vimrc and gvimrc
gix gui options