Added --haplotype option

git-svn-id: https://svn.code.sf.net/p/vcftools/code@863 19d466ce-640d-45be-954f-fad4d9839663
Merge remote-tracking branch 'upstream'