Merging in the development branch to the phylogeny branch, bringing in
the multiple outgroups code.