Generics on IMeasurement

Broad changes, but allows neat separation of Environment and Organism
measurements