Updates
Merge branch 'master' of https://github.com/mrichman/dotfiles

Conflicts:
	mac/.bash_profile