Merge branch 'vim'

Conflicts:
	src/option.c
Merge branch 'mac-vim-orig'

Merged official MacVim repository updated to the latest release, which doesn't change anything from the latest g-snapshot released few days ago