Aggregation changes and more fixes

Removed most of MapReduce, added section on Aggregation Framework,
additional fixes.