Merging the fixes and features added to the public repo with the pairwise features. There was quite a bit to merge, as adding binomial and nSL support to Hapbin 1 changed things around quite a bit. Everything compiles in MPI and non-MPI modes, but things have not been extensively tested to ensure that fixes made to Hapbin 1 were kept in the merge.
Merging the fixes and features added to the public repo with the pairwise features. There was quite a bit to merge, as adding binomial and nSL support to Hapbin 1 changed things around quite a bit. Everything compiles in MPI and non-MPI modes, but things have not been extensively tested to ensure that fixes made to Hapbin 1 were kept in the merge.