Clean merge of sample gvimrc