Final changes before testing on BF Display.
Merge branch 'Comparison' of https://github.com/rachelalbert/ucb-bankslab-BFDisplay into Comparison

Final changes on two computers - no conflicts apparent? Will check.