merged UnidataCoverageDescriptor and VariableWrapper classes

- there is still work to do to clean this up