add changes for aliases.
merge
Merge branch 'master' of github.com:ashleydev/oh-my-zsh

Conflicts:
	lib/directories.zsh