Changed render order and cleaned up city code

Units now render after all buildings have been drawn, got rid of some
legacy code in the city classes.