Merge git://github.com/taizawa/dotfiles
update
merge