Set -Djava.awt.headless=true for ant test

Makes running tests less annoying with OS X/Java7
Merge branch 'cassandra-1.1' into cassandra-1.2
Merge branch 'cassandra-1.2' into trunk