update emacs.d
Merge branch 'master' into vim