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

diff --cc site_cons/site_tools/asymptote.py
Simple merge

diff --cc src/apparatus/main.tex
index a54b74ea5c854bd6822dd65700816cec2bd3839b,c87d3b81371a74846be4d87dc9b7363c8aef73d2..f74772b59cb7ff2a7e3184d9bcd19e12df1896d3
--- 1/src/apparatus/main.tex
--- 2/src/apparatus/main.tex
+++ b/src/apparatus/main.tex
@@@ -8,8 -8,9 +8,9 @@@ outline the procedure for synthesizing 
  (\cref{sec:polymer-synthesis}).  With the groundwork out of the way,
  we will look at sample preparation (\cref{sec:sample-preparation}) and
  the velocity clamp force spectroscopy procedure
 -(\cref{sec:procedure}).  Finally, we will give an executive summary of
 -cantilever calibration (\cref{sec:cantilever-calib:intro}) which is
 -discussed in more detail in \cref{sec:cantilever-calib}.
 +(\cref{sec:procedure}).  Finally, we will give a summary of cantilever
- calibration (\cref{sec:cantilever-calib:intro}).
++calibration (\cref{sec:cantilever-calib:intro}) which is discussed in
++more detail in \cref{sec:cantilever-calib}.
  
  Everything discussed in this chapter, with the possible exception of
  cantilever calibration, is fairly standard practice in the field of