Fixes #21
Fixes #17
Merge pull request #23 from broadinstitute/BUS-83-consent-updates

Bus 83 consent updates