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