adding geocoder
forcing cap to 2
changing deploy host
merging