ds composite cleanup, and additions.

Similar to the [large image](https://github.com/Islandora/islandora_solution_pack_large_image/pull/59), [basic image](https://github.com/Islandora/islandora_solution_pack_image/pull/47) pull requests.