Implements #4 - apply correct costing when tariffs vary through 2 GPS points
Merge branch 'varnewTariff'