Merge pull request #9 from will123195/master

Latest version of map-reduce
map-reduce 6.0 compat, tap harness