Incorporation of lots of recent changes

This PR combines Alex's changes with my changes.  There's still more to do, of course!  cdrDemo has been tested in the lab, and spits out a derived angular offset of the Sun (i.e., what we'll send to CTL) using basic assumptions.

Merging immediately (so Steve should watch out for anything that breaks the demo for thermal vac)