Added 3 els.
Merge branch 'master' of github.com:nuklly/emacs-d

Conflicts:
	init-edit.el