Add matrix ...
Merge branch 'master' of https://github.com/jimyhuang/vim

Conflicts:
	.vimrc