Highway & rail linkshape files now merged

Merge occurs when generating transit files.
Minor changes to linkshape merge procedure