update init.el
Merge branch 'master' of github.com:shuichinet/emacs