Changed some aliases
Merge branch 'master' of github.com:Nooby/dotfiles

Conflicts:
	.zshrc
Updated Oh My ZSH