oskarth
commented
5 years ago fixed merge conflicts
This PR has been open for way too long, I'm going to merge this as partial progress and we can clean it up later.
@corpetty please look at the PR reviews here and address as you think is appropriate, i.e. fixup PRs/issues
Ping @corpetty, is this ready for review? please request if so