Merge accidentally created temp branch.
Also, attempt to fix calcinator server sync issues.  Thanks a lot, past me, for not understanding how to sync things.