Squashed 'floo/common/' changes from bc039ff..f07d874

f07d874 Don't hard-code sublime text as editor/client version/name.
6e85819 Merge common. Fix conflict.

git-subtree-dir: floo/common
git-subtree-split: f07d8740ce91c72db2ddca5fc312ab2b6729dd8e
Merge commit 'd774742689ceff32515ca60f5d1bf3a0c72b68aa'
Use editor name.