Merge pull request #63 from projectcypress/mesaure_model_cleanup

Cleaning up the measure model and associated measure fixtures
Fixing the selection of a default bundle

My previous code here placed the default bundle id as the hash key
but forgot to query by it.
Releasing 3.3.0

Updating the changelog and version number
Updating the dependencies in the Gemfile.lock
fixing stratification reporting bugs in cat III generation
Merge pull request #76 from projectcypress/cat_3_stratifications

fixing stratification reporting bugs in cat III generation
removal time for medical equipment
Merge branch 'removal-time'

Merging pull request #70 by rebasing on top of master https://github.com/projectcypress/health-data-standards/pull/70
Minor tweak in the lockfile to accomidate the java platform
adding 38 week gestational period
Merge branch 'gestational-period'

Rebasing and merging PR #69 on master https://github.com/projectcypress/health-data-standards/pull/69
Updating the README changelog
add incision_time to procedure imports
use cat1 procedure performed importer
Revert "add incision_time to procedure imports". Use cat1 procedure performed importer instead.

This reverts commit 4ff3382e1567b931670e39bada4f9f3a25759664.
Updating to the changelog in the readme.
add admit_time to encounter importer
Merge branch 'admit_time'

Rebasing and merging pull request #80
Updating the changelog in the readme.
import entry.time (not entry.start_time) for diagnostic study orders
fixing test to reflect that diagnostic study order should use time, not start_time.