updating bulk record importer to accept json documents and address issues with loading from directories as well as error handling and testing
Merge branch 'master' of github.com:projectcypress/health-data-standards into json_patient_import
Switching from passing in a File to a Dir

It appears that using JRuby File.new(a_directory) throws a Permission denied
exception. This code works fine with File.new on MRI/YARV.
Merge pull request #139 from projectcypress/json_patient_import

Json patient import
Fixing date calculations in the prefilters

Previously, when calculating the dates for prefilters, we were
calculating a year as just 365 days. This new code uses actual date
functions to account for things like leap years.
Now properly sets the ordinality when importing

Switching the parent class to CDA::ProcedureImporter. This allows us
to use the extract_ordinality method available there. The previous
implementation has its own extract_ordinality method, which assigned
an incorrect structure to ordinality.
Merge pull request #140 from projectcypress/fix_prefilters

Fixing date calculations in the prefilters
Merge pull request #141 from projectcypress/ordinality_fix

Now properly sets the ordinality when importing
fixing cv reporting bug in cat 3 export
updated cv template to except id and value
Merge branch 'cat3_cv_fix'

Rebasing and merging pull request #142
Bumping for v3.4.6
Correctly handle "Concurrent" with Measurement Period Start or End

When the HQMF parser sees references to Measurement Period Start and
Measurement Period End these are converted to Start of Measurement
Period and End of Measurement Period; this commit adds support for the
"Concurrent" operators during this conversion, ie SCW MPE -> SCWE MP
Merge pull request #143 from projectcypress/concurrent_with_measurement_period

Correctly handle "Concurrent" with Measurement Period Start or End
Adding 2.1 test xml fixtures
Add 93 EP/EH measures in HQMFr1 format to the test fixtures, along with script for extracting them from a bundle.
Add test case that loads hqmf_r1 measures, generates hqmf_r2.1 measures, and validates against hqmf_r2.1 scheam
Update hqmf_r2.1 test to report on highest frequency errors
hqmf_r2.1: replace observationReference with criteriaReference in templates
hqmf_r2.1: id should not have a nested item element