增加zsh,tmux配置，修改vim配置
Merge branch 'master' of github.com:fangwentong/dotfiles

Conflicts:
	install.sh