Merge branch 'serialization_improvements'

Conflicts:
	src/main/java/com/clearspring/analytics/stream/cardinality/HyperLogLogPlus.java