Merge pull request #1 from glennsb/fixes

Fixes from glennsb: 
- fix typo in readme 
- fix bug where haplotypes being set to 0 incorrectly
Merge remote-tracking branch 'upstream/master' into upstream
Sets our python2.7 path
Just remove lines of nothing but spaces (because I'm weird like that)
allows the geno_haps to be NA as well