Merge remote-tracking branch 'qvacua/master' into feat/framework

Conflicts:
	src/MacVim/MMAppController.m
	src/MacVim/MMAtsuiTextView.m
	src/MacVim/MMTextStorage.m
	src/MacVim/MacVim.xcodeproj/project.pbxproj