Working (but ugly) city rendering!
Cleaned up the city renderer with more sensible matches