Moved master out of main.
Fixed merge conflicts.
Merge branch 'master' of https://github.com/TheBottleSeller/MapReduceFacility
Merge branch 'master' of https://github.com/TheBottleSeller/MapReduceFacility
Added master to main.
Merge branch 'master' of https://github.com/TheBottleSeller/MapReduceFacility
Merge branch 'master' of https://github.com/TheBottleSeller/MapReduceFacility
Cleaned up code.