Revert "Merge branch 'master' of https://github.com/dust5/Bubbles"

This reverts commit 64b28a091c9c42b0805128c754321a5f1b1353bb, reversing
changes made to 077a1bddf6cac2a8a54d8519adf3f282b5da7299.
Revert "Revert "Merge branch 'master' of https://github.com/dust5/Bubbles""

This reverts commit 4f0ae03a4231c9779b65de5ff3a7b49dfdc89d11.