Eliminate ExtraTodoModel and incorporate needed parts into TodoSortFilterProxyModel
This should help eliminate some duplicate code and also eliminate bugs in the interaction between Proxy (TodoSortFilter) to Proxy (ExtraTodoModel) to the base TodoModel.
Handling of ETMCalendar pointers is also now consistent across calendar with Akonadi::ETMCalendar::Ptr