Fixed conflict

README.md

Rakefile

lib/geocoder/lookup.rb

lib/geocoder/lookups/mapzen.rb

lib/geocoder/lookups/pelias.rb

lib/geocoder/results/mapzen.rb

lib/geocoder/results/pelias.rb

test/fixtures/pelias_madison_square_garden

test/fixtures/pelias_no_results

test/test_helper.rb

test/unit/lookups/geoportail_lu_test.rb

test/unit/lookups/mapzen_test.rb

test/unit/lookups/pelias_test.rb