bring astyanax back
Merge branch 'astyanax-with-cassandra-2.0' into titan05