Use reduceByKey + collectAsMap instead of modifying a map

I think this is maybe a more functional approach (and it more closely matches what we had up on the slides in the mornings presentations). Feel free to tell me I'm crazy :)