Combine the residential apt and residential flat zone types

[misaugstad]

In the stats_for_paper script, collapse those zone types (but keep "residential" as its own zone type).