immunizations and vitals match for Vitera
Vitera payers now match
demographics match for Vitera_CCDA_SMART
Vitera procedures match
Merge branch 'master' into afsin-generator, all merged except vitals

Conflicts:
	lib/generator/ccda/templates/demographics.js
	lib/generator/ccda/templates/vitals.js
	test/fixtures/files/parse_gen_parse/generated/CCD_1_generated.xml
	test/fixtures/files/parse_gen_parse/generated/CCD_1_generated_2.xml
	test/fixtures/files/parse_gen_parse/generated/Vitera_CCDA_SMART_Sample_generated.json
	test/fixtures/files/parse_gen_parse/generated/Vitera_CCDA_SMART_Sample_generated.xml
	test/fixtures/files/parse_gen_parse/generated/Vitera_CCDA_SMART_Sample_generated_2.json
	test/fixtures/files/parse_gen_parse/generated/Vitera_CCDA_SMART_Sample_generated_2.xml
beautified demographics.js
vitals.js reintroduce matt changes
do not depend existence of generated directory
package update with generated files
Merge pull request #175 from amida-tech/afsin-generator

generator fixes for Vitera sample file
remove generated files from repository
update gitignore for generated
Merge pull request #176 from amida-tech/afsin-generator

Remove generated files from repo
Merge branch 'master' into c32-support

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_new.json