Update repo manifest
Include the new G2 repos and fix some typos in other listings