Squashed 'plugin/floo/common/' changes from 53df063..69dc872

69dc872 Fix conflict
ade2da6 Update bits of .floo that need updated. Don't stomp over it completely.
4dc7f3e More efficient
9f3d6d5 Probably more efficient.
b2cd22f Merge commit '023c6e223a1403763dbb594dd2dd205924dee86f'
04f9a19 Use old-school ignore.
ce1889b Merge branch 'master' into queueu-create-and-stat
8d7d0c9 Smoother create workspace:

git-subtree-dir: plugin/floo/common
git-subtree-split: 69dc8729d7364a01b4d8a41fdd9e04381a3cb1a1
Merge commit '450568931b58b9d29a002d28bc195454ddd4db69'