Update statusline from master.
vim: remove unused mappings