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

We should make this configurable.
Leave logging in
Merge pull request #5 from charsmith/combined

Ported combined input for fixing #2