Subset map defaults to using provided term except for exception cases
Merge pull request #420 from projecttacoma/default_subset

Subset map defaults to using provided term except for exception cases