partial merge of Simon's changes

Martin Reineckerequested to merge
tweak_setup into ducc_0_1

This merges almost all of @g-simonperkins's changes, except for the package naming, which needs more discussion.

Merge request reports