Fixed some merge Errors
geocoded the stops and added the corresponding column to the mapping
file and stop object