Mathematica (part deux) -- replaces #931

Updated version of #931 with master merged, conflicts resolved, new sample data regen'ed, etc.

/cc @cgranade @@pchaigno @arfon @bkeepers @tnm