Update the dotfile.
Merge branch 'master' of http://github.com/katonori/misc

Conflicts:
	.zshrc