script/bootstrap: be more explicit about what is being overwritten
Merge pull request #173 from tobygale/explicit-bootstrap

script/bootstrap: be more explicit about what is being overwritten
updated atom
Merge remote-tracking branch 'holman/master'