Removed Demographics Switch

The data is now available. There is no longer a need for this switch. The acceptance tests were also updated.

@dsjen @rocha
`sorted_by_year` seemed to be clearer to me.