Squashed 'floo/common/' changes from f7ad5d9..9da7bd0

9da7bd0 Work around horrible Sublime Text 3 bug on OS X. Fixes #201.

git-subtree-dir: floo/common
git-subtree-split: 9da7bd06364cd317dcfe123d0c21a87c332d990f
Merge commit '6c4a454e011a78a47cdb0c19c686ad510d7d4351'
Bump version.