add auto vip detect
More tweaks needed to get auto detect to work
Some cleanups to handle the LargeStaticSites scenario