merged some changes from the mac .vimrc