Supermerge to sunDemo!

All the capabilities of `thermvacDemo` have been merged with `cdrDemo`, including Alex's recent improvements.  Accordingly, I have renamed `cdrDemo` to `sunDemo`.

thermvacDemo does not currently compile after this merge.  In principle, that could be fixed, but it's probably better to rebase a new thermvacDemo off of sunDemo.  Steve should confirm that sunDemo includes all the functionality of the old thermvacDemo.