always use dotfiles z
Merge branch 'master' of github.com:davidosomething/dotfiles

Conflicts:
	bash/.bashrc.symlink