Do not route an activity to a manager of a collabdoc if he's editing the document as well
Support exclusion associations for activity routing
Storing etherpad author mapping in Redis + code cleanup
Code cleanup on collabdoc notification PR
ContentDAO.Etherpad.getUserIds returns an object
Don't send emails for content metadata update or restoring revisions
Merged oaeproject/master into simong/collabdoc-notifications
Merged oaeproject/master into simong/collabdoc-notifications
Merge branch 'master' into collabdoc-notifications

* master: (29 commits)
  (Release 6.3.0) Remove shrinkwrap
  (Release 6.3.0) Bump version
  remove unused jscoverage instrumenter
  (TravisCI) Don't cat logs, even filtering to errors will blow out the console
  (URI Cleanup) Add assertions for response model of picture endpoints
  (URI Cleanup) Additional comment formatting clean-up
  (URI Cleanup) Review followup
  (URI Cleanup) Improved tests for URI assertions. Minor code cleanup
  Documentation improvements
  Added some documentation on bodyParser(limit)
  (URI Cleanup) Followup from self review
  (URI Cleanup) Don't output URIs, add downloadPath to revision
  Upgrade express to latest
  OAE_COVERING is no longer used
  Point oae-rest back to 'latest'
  (Release 6.2.0) Remove shrinkwrap
  (Release 6.2.0) Bump version
  Pointing oae-rest to oaeproject's github rather than mrvisser's.
  Improve image JPG conversion logging
  soffice binary default is soffice not soffice.bin
  ...
Renamed `current-collaborators` to `online-authors`

Also added a note about a potential micro-optimization and did some self-review
Merged oaeproject/master into simong/collabdoc-notifications
Merge branch 'collabdoc-notifications' of https://github.com/simong/Hilary into collabdoc-notifications
Minor follow up on online authors