This to fix an odd race condition with autodetection of ssh forwarding and
writing the ansible inventory, this error is seen with vagrant 1.6.5.
Also cleaned up an extra ip definition that creeped into the config.
Change-Id: I4ec9338c95dfe399f7177bff4ab1cc3d6e865412