Merge pull request #500 from metamx/batch-ingestion-fixes

Batch ingestion fixes