minor alias updates
Merge branch 'master' of github.com:mauriciosilva/oh-my-zsh

Conflicts:
	plugins/mauo/mauo.plugin.zsh