add data from socrata API
add foursquare stuff
Merge branch 'gh-pages' into add_apis

Conflicts:
	geodata/script.js
add more base tiles
Merge branch 'gh-pages' of https://github.com/codeforboston/ungentry into gh-pages

Conflicts:
	geodata/script.js