Update to Rivet 2.2.0

And a bunch of other improvements, including variable-R calorimeter jets for the "resolved" analysis.