Half-merge, half-specialize.  Nothing really new.

This is mostly a merge with the script that I was using for
science, which has slightly different defaults.