added matlab-emacs, nxhtml, django-mumamo
merged with iMac ssh config

Conflicts:

	.ssh/config