Fix vim's highlighting in the framebuffer terminal
Merge branch 'my-rpi' into laptop