Gabe bootstrap surgery

pulled out the merge commits from testing with docker