Fix geocoding specs, add them to makefile
Merge remote-tracking branch 'origin/CDB-1734' into release/2.10.0

Conflicts:
	Makefile
	app/models/geocoding.rb
	spec/models/geocoding_spec.rb