code review edits
Merge branch '799_mo_wizard' of https://github.com/thecartercenter/elmo into 799_mo_wizard