tidy vimrc
merge