formatting
Merge branch 'master' of https://github.com/maxthomas/jerboa
MapReduce fixes