Merge octave-mod.el and octave-inf.el into octave.el with some