update for 24.4
Merge branch 'master' of https://github.com/Johniel/.emacs.d