Updated analytics.py to output city name as well.
Changed k value for hubs, this value changes a lot.
Fixed merge conflicts.