Various updates to use vagrant to do this.