Updated some rake tasks to use HealthDataStandards::CQM::Bundle instead of Bundle, which was failing
Merge branch 'bundle_rake_task_update'

Rebasing and mergeing pull request #167
Added provider rollup to JSON record importer
Merge branch 'json_provider_rollup'

Rebasing and merging pull request #168
Updated .gemspec to use newer version of ActiveSupport; Gemfile to update minitest/remove incompatible version of Turn, and test_helper to remove test/unit require
Removed references to old MiniTest test case type, and Test::Unit test case type
Updated minitest to 5.3.5 to allow for Minitest expectations ('must_equal') to be used without issue
fixed most of the test errors caused by the upgrade to the latest version of Minitest. Errors/failures from other upgrades remain
Added Provider fixtures for C32 importer testing
Set Minitest to ~>5.3, and added minitest-reporters for pretty printing of test results
Added minitest reporters to test helper
Updated a number of test functions to make them run correctly
Fixed one last testing issue with ProviderImporter after the MiniTest upgrade
Merge pull request #170 from projectcypress/rails_4_1

Updates necessary for Rails 4.1
bump mongoid to final 4.0 version
Committing the lockfile to match the gemspec
Merge branch 'bump_mongoid'

Rebasing and merging pull request #172
Also added the lockfile
parameterize measure properties, allow for optional additional props
Merge branch 'categories_with_optional_properties'

Rebasing and merging pull request #173
Add support for other applications to access additional data about records assigned to the orphan provider. This will be used by popHealth to log the ID of each record which is assigned to the orphan provider.