Fix discharge reporting. Port to 0.6.
Fix a typo in IceModel::step() (in dev).