Fjern babel auto-hyphens i tex
Nyt org-mode titel cite-format
Fjern custom-variables
Merge branch 'master' of https://github.com/stenskjaer/dot-emacs

Conflicts:
	config/custom-variables.el