Merge remote-tracking branch 'local/master'

Merge remote-tracking branch 'local/master'

With thesis development distributed over a number of machines, I lost
track of a few repositories.  This pulls in some changes from a
recently rediscovered repo.

* local/master:
  Relabel src/unfolding/rate.tex as sec:unfolding-rate.
  Consolidate references to cantilever calibration summary as sec:cantilever-calib:intro.
  Remove cruft from SCons generator bodies.

Conflicts:
	src/apparatus/main.tex
	src/unfolding/rate.tex