Remove Google Business from Readme
Fix conflicts

Conflicts:
	README.md
	test_geocoder.py