Add correct submodules, remove atom from bootstrap script