Test script and fixes for convolution.
tweak test script
last fix
Patch from A. Hughes
updated extra spectra routine and mc_calc_errors.
Getting new changes from Adam.
Merge remote-tracking branch 'upstream/master'