Updates
Merge branch 'master' of github.com:mnapoli/dotfiles

Conflicts:
	.zshrc
Suppressed alias