fixes #1721 updated map reduce to use both enteredByUser and user

for https://github.com/jrwdunham/dative/issues/31