update
Merge branch 'master' of https://github.com/bingwen/dotzsh

Conflicts:
	zshrc