checkpoint
Merge branch 'master' of github.com:bigblindbais/dotfiles

Conflicts:
	zsh/aliases
	zsh/zshrc