added mme-tools to erlang-mode
Merge branch 'master' of https://github.com/sebastiw/.emacs.d

Conflicts:
	init/init-erlang.el