Update vgsite to match master