merge mac/win
clean up vimrc