fixed issue that underscore detection was causing tests outside avrosimplefeature to fail
Conflicts:
	geomesa-core/src/main/scala/geomesa/core/avro/AvroSimpleFeature.scala
	geomesa-core/src/main/scala/geomesa/core/avro/FeatureSpecificReader.scala
	geomesa-core/src/test/scala/geomesa/core/avro/AvroSimpleFeatureTest.scala
fixed issue that underscore detection was causing tests outside avrosimplefeature to fail
fixed issue that underscore detection was causing tests outside avrosimplefeature to fail
fixed issue that underscore detection was causing tests outside avrosimplefeature to fail
Conflicts:
	geomesa-core/src/main/scala/geomesa/core/avro/AvroSimpleFeature.scala
	geomesa-core/src/main/scala/geomesa/core/avro/FeatureSpecificReader.scala
	geomesa-core/src/test/scala/geomesa/core/avro/AvroSimpleFeatureTest.scala
Removed underscore encode step

created errors in other tests, fixed other style issues.
removed underscore replacement