update init
Merge branch 'master' of github.com:zenozeng/.emacs.d