Make cursor and erc change on both machines
Reformulate some of the capture command lines
Update languages for org-babel
No LDAP address completion for the moment

Revisit this later
Work on email and feed setup

- documentation
- spacing
Merge branch 'master' of github.com:mrvdb/emacs-config

* 'master' of github.com:mrvdb/emacs-config:
  Correction that make emacs start without errors

Conflicts:
	mrb.org