Convert to vagrant 1.2, fix some script quirks