item2升级，更新配置
Merge branch 'master' of github.com:dongxiong/dotfiles