Revert "Refactor bootstrap"

This reverts commit b564ee432e9e35ffc36c25af5d6d075770dd374b.

Conflicts:
	zsh/antigen
Add docker-pull-ubuntu