Merge .vimrc from master