Resolve conflicts with wtsi-npg/devel
Merge pull request #24 from wtsi-npg/devel

Merge recent changes from wtsi-npg:devel
Merge branch 'devel' of github.com:iainrb/genotyping into devel
Correctly set output path default
Correct arguments to filter_samples.pl
Merge pull request #138 from iainrb/devel

Bugfixes in QC test