Ported combined input for fixing #2
Keep default input format for Aegisthus

We should make this configurable.
Leave logging in
initial cassandra 1.2 commit
formatting
Merge pull request #11 from charsmith/cass1.2

Casssandra 1.2 support
Merge pull request #5 from charsmith/combined

Ported combined input for fixing #2