added logic to distingish between whats needed for an ami and vbox
Merge branch 'cg-4-feature-refactor-setup' of https://github.com/controlgroup/cg-init into cg-4-feature-refactor-setup