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

Conflicts:
	.bash/darwin.sh
	.vimrc