New vimrc
Merge revisions