Merge branch 'master' of github-kototama:kototama/.emacs.d