Fix manifest ref and use tissue types.
Merge pull request #324 from mattdenner/correct_manifest_and_sample_types

Correct manifest and sample types
Need to use extractor, not the extractor function
Merge pull request #328 from mattdenner/fix_deep_merge_issue

Need to use extractor, not the extractor function
Merge remote-tracking branch 'sanger/uat' into HEAD