regular update
Merge branch 'master' of https://github.com/xahlee/xah_emacs_init