Merged code between George's and my version of your experiment

For some reason I can't completely reconstruct George's and my repos had diverged with respect to your code. I think it's because you had changed some files in George's working copy on the setup but not committed them, and then subsequently George committed them as part of other bug fixes.

Whatever the reason, please merge this branch and make sure your files are correct.