merge OS X 's vimrc