Allow the existence of haploid genotypes in the genotype table. See #536
Add fix for htaccess on generate-names. See #541