Fixed position of zsh aliases
Merge branch 'master' of https://github.com/njbair/oh-my-zsh

Conflicts:
	zshrc