Add mustache
Merge branch 'master' of github.com:edance/vim

Conflicts:
	.gitmodules