Add bundles as submodules; add guioptions
Tweak setup script