update
Merge branch 'master' of github.com:shenfeng/dotfiles

Conflicts:
	install
	zsh/aliases
update ssh_config