add support for mixed

Conflicts:
	generation/gen.rb
	lib/cda/adxp_city.rb
	lib/cda/adxp_country.rb
	lib/cda/adxp_county.rb
	lib/cda/adxp_delimiter.rb
	lib/cda/adxp_direction.rb
	lib/cda/adxp_precinct.rb
	lib/cda/adxp_state.rb
	lib/cda/bin.rb
	lib/cda/en_delimiter.rb
	lib/cda/en_family.rb
	lib/cda/en_given.rb
	lib/cda/en_prefix.rb
	lib/cda/en_suffix.rb
	lib/cda/st.rb
	lib/cda/thumbnail.rb