cheeseshop bugfix release
use kaleidoscope for merges
show line number, as well as relative numbers
ignore CACHE directory
update submodules
hotkeys for flamingo and airmail