Refactor stat_for_name and rename to get_stat_fn
Change names of a couple settings

Rather than '--sample-from residuals' or '--sample-from-raw', we
now sample from raw by default, and you can give
--sample-from-residuals to change that.

Instead of '--sample-method boot' or '--sample-method perm',
we now have '--sample-with-replacement'.