Add merge label
Merge branch 'hotfix/halo-readd-merge-label'
Merge branch 'hotfix/halo-readd-merge-label' into develop
Add SLURM_CLUSTER to allow for use with milou and halvan
Merge branch 'hotfix/add-milou' into develop