updates
Merge branch 'auto-batch' of https://github.com/JHUISI/charm into auto-batch