refactor part 2/2

@bellycard/infrastructure 
More refactor.  More tests.
I don't follow why they are separate, you can query tags from consul. There won't be a time where we want to deploy an app to two stacks in a single AZ.