Added the geocoder/map script tag.
Complete merge.