Revert "de-bundle various recent additions"

This reverts commit 9ac754db5506f215df836cf30c44843f16c69ad0.
set DOCKER_HOST for boot2docker if it's installed