fix
Merge branch 'master' of github.com:mshibata/dotfiles
rbenv
Merge branch 'master' of github.com:mshibata/dotfiles

Conflicts:
    .zshenv