Forgot to stage MMTypes which contains the new msg

Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/MacVim/MacVim.h
	src/MacVim/MacVim.m