Resolve conflicts with wtsi-npg/devel
Merge branch 'devel' of github.com:iainrb/genotyping into devel
Correctly set output path default
Correct arguments to filter_samples.pl