ALL MODELS:  Batch output overhaul for correct timestamp use; Timestamps added to all models
Merge branch 'jon' into sprint7