improved wildcards. whitespace allowed, unified syntax. updated docs.
Merge branch 'genotype_wildcard_2'