osx configuration adjustments
Merge branch 'master' of github.com:Mytho/dotfiles

Conflicts:
	.zsh/aliases