Merge Matt's fix for the mirror loss quantum noise problem

Merging matt's branch into Optickle2.