added income data for geo_regions
analysis now stores data correctly
Merge branch 'master' into show-food-on-map

Conflicts:
	app/views/analyses/show.html.haml