Improve Stress Tool
patch by Benedict; reviewed by Pavel Yaskevich for CASSANDRA-6199
close streams
use junit assertions
add .gitignore
patch by Michael Shuler; reviewed by jbellis for CASSANDRA-4899
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Fix streaming older SSTable yields row tombstones

patch by yukim; reviewed by jbellis for CASSANDRA-6527
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
Merge remote-tracking branch 'origin/trunk' into merge-5549
slight rename, plus finish OpOrdering.safe impl