implement portal data download via Socrata api
update to import featured socrata cities
fix merge conflicts
load test data