Move set -e to the top
Merge branch 'master' of github.com:petermac-/dotfiles

Conflicts:
	setup/bootstrap