Add carrier and city to plans
fixed conflict
updated schema file
added geocoder gem
Geocode for cities
added heatmap
added new database rows
Heatmap works for Toronto area
Merge branch 'heatmap'