Changed occupancy mapping and overriding types

Analysing the output for Attica has led to these changes in the occupancy mapping files and the list of overriding occupancies.

\approve @marius