CCD_1.xml allergies gen parse gen now match
Merge branch 'master' into afsin-generator

Conflicts:
	test/fixtures/files/parse_gen_parse/generated/CCD_1_generated.json
	test/fixtures/files/parse_gen_parse/generated/CCD_1_generated_2.json
	test/fixtures/files/parse_gen_parse/generated/CCD_1_generated_2.xml
CCD_1 demographics match
encounters now match for CCD_1
immunization section in CCD_1 matches
CCD_1 medications now match
CCD_1 payers now match
CCD_1 problems now match
CCD_1 procedures now match
social_history matches now.
Do not compare parser errors (most nullFlavor errors) and remove generated files
Add back the generated files.  At some point they should be removed but not important right now.
Merge pull request #164 from amida-tech/afsin-generator

Generator fixes