Merge pull request #26 from scooperstein/master

latest ZH analysis code
some small changes to get zh selections to work with latest fsa package
merging