updated gemfile, created tmp folder for import task
merge
added combined zipcodes to geojson
Merge branch 'master' of github.com:datamade/chicago-atlas
importing merged zip codes
added chitrec data, implemented first pass at chitrec import function
upgraded to highcharts 3.0.1
displaying imported chitrec data on geography detail page
Merge pull request #40 from datamade/master

chitrec import