Add mustache plugin
Merge branch 'master' of https://github.com/hobeone/dotfiles

Conflicts:
	.gitmodules