Add mumamo mode support
Merge branch 'master' of github.com:candera/emacs

Conflicts:
	.gitmodules