Support for Calvet_2 and Nidever
Fix bug in condense assignements, don't really understand
bugfix in rejigger
Add support for Setup 1 of hotjupiters_1