add logs/ and data/ to .gitignore
Merge branch 'cassandra-1.2' into cassandra-2.0