Add plotting job and fix issues in merging results

Moves the plotting routines to a separate post-processing job (different to the user-specific post-processing job). This will allow plotting to be done in parallel with other post-processing and provide more flexibility. In particular it solves the issue of generating figures for a combined run.

Additionally fixes issues in the merging of results and interaction with non-parallel runs.