tmp
Merge branch 'katenauta' of ghe.amb.ca.local:satake-hiroyuki/dotfiles into katenauta

Conflicts:
	.zshrc
vim
Merge branch 'katenauta' of ghe.amb.ca.local:satake-hiroyuki/dotfiles into katenauta

Conflicts:
	.vimrc
Merge remote-tracking branch 'ghe/katenauta' into kiko

Conflicts:
	.zshrc