A few more items.* metrics, and move uploaded to uploaded.batches.
Merge pull request #139 from graydon/more-measure-ingress-metrics

A few more items.* metrics, and move uploaded to uploaded.batches.