merge with mac .vimrc
solving conflict merging .vimrc 1