added act as alias for activat
Merge branch 'master' of https://github.com/dabido/prezto

Conflicts:
	runcoms/zshrc