Fiddling on new machine
Merge branch 'master' of github.com:rjshade/dotfiles

Conflicts:
	zsh/zsh.d/0_env.zsh