Updated aliases.
Merge branch 'master' of github.com:ajordens/oh-my-zsh

Conflicts:
	templates/zshrc.zsh-template