modify several changes.
Merge branch 'master' of ssh://github.com/analogeryuta/dotfiles

Conflicts:
	dot.zshenv