update
Merge branch 'master' of https://github.com/schnecki/dot-emacs.d

Conflicts:
	24/emacs.el