Fixed wordcount to use the new map/reduce functions