Improved Measurements of the Sun’s Meridional Flow and Torsional Oscillation from Correlation Tracking on MDI and HMI Magnetograms