Back to Work

[billroper]

After a much-needed week of vacation (where I didn't get done nearly all of the things that I wanted to -- which should not be a surprise!), it was back to work today. I have one more round of eradicating compile errors from the latest merge.

This will take a while.