fixed map/reduce
Merge branch 'master' of https://github.com/designhaiku/bigdata