Electrification of Harrogate line included in new Yorkshire rail plan