Merge pull request #6 from setowns1/bug

Textually simpler, but functionally identical, CADRE_mdp.py
Added units and desc
Merge remote-tracking branch 'origin'
Updated units and descriptions for components
Merge remote-tracking branch 'upstream/master' into 60716408
Merge remote-tracking branch 'hschilling/CADRE-units-desc' into 60716408
Updated units and desc. Fixed bugs
Merge branch '60716408' of https://github.com/crobinsonut/CADRE into CADRE-units-desc
Fixing errors
Merge branch '60716408' of https://github.com/crobinsonut/CADRE into CADRE-units-desc
More fixes
Merge branch '60716408' of https://github.com/crobinsonut/CADRE into CADRE-units-desc
Fixed bugs
Fixing units.
Ignoring temp files (~)
Fixed all units. Tests pass.
Includes Herb changes for printing units/descriptions.
updated roll problem
Fixed variable descriptions to match across comoponents
completed roll example