Forgot to change that key in next-to-next-to-last commit
Merge section 3.1 with section 6

This addresses Richard's point #13, #23 (I also replaced "errors"
by "uncertainties" throughout that subsection), as well as #14.
Tweak size and placement of figure 2