change DataBlock.std to mean_error
we use this as the error on the S21 data, so we want to scale it as such.
Merge remote-tracking branch 'origin/master'