wtf al
Merge branch 'master' of https://github.com/mako-taco/stream-lib

Conflicts:
	src/main/java/com/clearspring/analytics/stream/membership/CuckooFilter.java