Geocoding feature branch.
Fix bugz, add satellite
Merge pull request #61 from tmcw/geocoding

Geocoding feature branch.