MapReduce updated for local files, not tested
Merge branch 'master' of ssh://github.com/darrinwillis/distributedSystems
Merge branch 'master' of ssh://github.com/darrinwillis/distributedSystems