Some minor bug fixes
Merge branch 'v3' of github.com:veg/hyphy into v3