Fix dependency cycle by initializing concat::setup in earlier stage
Fix dependency for straycat::os::ipa_client.  Use our class and not a class it contains.
First pass at trying to do an override from Vagrant.  Don't like but it's a start.