Squashed 'floo/common/' changes from 208b6be..ff092be

ff092be -n Take vim specific things out of common. Whoops.

git-subtree-dir: floo/common
git-subtree-split: ff092be4049aeaf258c7c76dac339fb2de712c3c
Merge commit '3a93fcef5d3a89b0d452af1f404da7b336ce6a7e'