Some more minor v10 changes.

Details as in individual commits.

Note: for the integrated luminosity in master_2012_cfg.py, I used the average luminosity of the two channels, since they were very slightly different. This probably isn't the best way to deal with this...