fixes #157 (smoking status should be name)
nom bump
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