correct twitter-handle for zurich author
+ Geneva / Switzerland
+ City Zurich/Switzerland; + City Winterthur/Switzerland
Changes to JSON structure + fixes for Swiss cities.
Fix Geneva.