Merge branch 'master' of github.com:/hkurokawa/dotfiles