Updates to bring MapReduce code in line with CLI; some changes merged from AADDA branch.