Allow Vagrant installation while working in non-master branches allow repo update during bootstrap script to be overridden. [squashed]