Add medals won on day three, plus metadata changes

Water polo is no longer listed as an independent sport, it's now part of
aquatics as per IOC definition. Same goes for beach volleyball: it's now
just volleyball.