fixed bug with batch ops
Merge branch 'develop' of ssh://github.com/thecartercenter/elmo into develop