genotypeCompare takes intersection of sites, fix compiler warning in hash.c, makefile_icc for optimised compilation with icc rather than gcc
Added -readHap command to read phased impute2/shapeit2 data
Change gen to hap in typeIO report
Merge pull request #5 from johnlees/master

jl11 changes to pbwt code - Richard checked with John