Merged trunk, added CGC spawner to open files for Strata, as necessary.  Won't be useful for competition, but useful for analysis

Former-commit-id: 21066cf2f6eb7a1f43226c8e83d027db5c8918c8