Merge branch 'release-1.5.4'
Merge branch 'release-1.5.5'
Merge branch 'release-1.5.6'
Merge branch 'release-1.5.7'
Merge branch 'release-1.5.8'
Merge pull request #37 from wtsi-npg/master

Merge of wtsi-npg/master with iainrb/master
Merge pull request #38 from iainrb/master

Merge master into devel
Create VCF from Fluidigm/Sequenom CSV and run consistency check
Merge updates from plex_consistency and resolve conflicts
Make SNPSet name read-only
Remove code to read files from iRODS or local filesystem; instead take AssayResultSet objects as arguments
Modified for new input syntax
Include code to create AssayResultSet objects from iRODS or local filesystem (formerly in VCFConverter.pm)
Rename *_plex_dir to *_plex_coll
Rename arguments to converter and scripts
Rename plex_dir to plex_coll, additional sanity checking, update to help text
Merge pull request #39 from wtsi-npg/devel

Merge recent changes from wtsi-npg:devel
In sample table of pipeline DB; add 'cohort' column; fix bug in populating 'supplier_name' column
Merge pull request #270 from keithj/devel

Updated pipeline states
Update data collation to add cohort column to summary.csv