link zshrc
change some alias
Merge branch 'master' of github.com:Scorpiuszjj/configfiles

Conflicts:
	zshrc