change emacs config.
Merge branch 'master' of github.com:ashizawa/emacs.d