update noise model with code cleanup from PEF2F
updated glitch model, change 1j to I in likelihood
removed left-over conflict message
more cleanup from merge