Add conf/hotspot_compiler to .gitignore
Merge branch 'cassandra-2.1' into trunk