added lat/long to csv via geocoder gem
fixed merge conflict
Merge pull request #4 from codeforamerica/geocoding

Geocoding