adding aliases and such.
Merge branch 'master' of https://github.com/noyez/dotfiles

Conflicts:
	zsh/aliases.zsh