Some nice things for org mode.
Merge branch 'master' of github.com:LeifAndersen/Emacs

Conflicts:
	.emacs