Manual merge of Pull Request #220 via @gilesc50 (This fix uses the maps session api key to pass to the geocoder to stop API hits being racked up by geocoding)