tidy up totara support

[danmarsden]

I suspect that the totara support branch is needed because the main branch uses course category classes for the filter that do not exist in Totara - I think moving forwards we'll want to maintain separate braches as we'll probably move to report builder classes (maybe in both) to display a nicer/filterable report on the page. but... until then, we need to clean up the totara support branch a bit to include the latest changes and also to rename it from totara-master to use our normal naming conventions.