Bring vimrc and Mac version more inline