update
Merge branch 'master' of https://github.com/wgriffiths/dotfiles

Conflicts:
	bash_profile
	gitconfig
	zsh/aliases
	zshrc