Fix warning about unused local typedef
Fix tpie/CMakeLists.txt not including merge_sorter.cpp.
Merge branch 'queue' into next_v1.2
Merge branch 'snappy' into next_v1.2

Conflicts:
	doc/Doxyfile.in
	test/CMakeLists.txt
	test/unit/CMakeLists.txt
	test/unit/test_stream.cpp
	tpie/CMakeLists.txt
	tpie/atomic.cpp
	tpie/atomic.h
	tpie/memory.cpp
	tpie/pipelining/CMakeLists.txt
	tpie/pipelining/merge_sorter.h
	tpie/pipelining/merger.h
Rename file_stream.h -> uncompressed_stream.h
Rename tpie::file_stream -> tpie::uncompressed_stream
Add file_stream.h (just includes compressed/stream.h).
compressed/stream.h: Rename tpie::compressed_stream -> tpie::file_stream.
ut-compressed_stream: Rename tpie::compressed_stream -> tpie::file_stream.
Change default compressionFlags to compression_none.
Rename stream.h -> stream_old.h
Rename tpie::stream -> tpie::stream_old.
Rename cstream.h -> stream.h
Rename tpie::cstream -> tpie::stream
tpie/stream.h: Change compressed_stream -> file_stream.
Fix file_stream/compressed_stream/stream/cstream uses.
Make file_stream::beginning/end/current public.
Merge branch 'snappy_rename'
Reduce progress indicator frequency to 5

(cherry picked from commit 66d0d93beb08254b5b933102472745a18d923877)