Emacs: Changes for nodejs, display settings
Merge branch 'master' of https://github.com/noprompt/matilde

Conflicts:
	emacs.d/init.el