Docmunch pull

Here is everything on our branch. All of it is working in production.

appending ?w=1 to the url will help with a few of the diffs here