http basic auth and geocoder.us
Merge branch 'geocoder_us'