More Merge conflict changes
Merge branch 'make_inline_comments' of https://github.com/jphiii/phabricator-tools into make_inline_comments