updates
Merge branch 'master' of ssh://git.peterlyons.com/home/plyons/projects/dotfiles

Conflicts:
	bin/new_mac_setup