Changed backup AddMessage to AddWarning
Highway & rail linkshape files now merged

Merge occurs when generating transit files.
Minor changes to linkshape merge procedure
Merge pull request #32 from nmpeterson/master

Highway & rail linkshape files now merged during transit file generation