DotFileS Update
Merge branch 'master' of https://github.com/braidn/dotfiles-boxen

Conflicts:
	zshrc