Bringing vimrc up to date