Adding P6SPY (for debugging purposes). Minor changes.
Merge branch 'master' of git@github.com:EBIBioSamples/biosd_model_load.git