vim: simplified session
vim: better title bar filename
Merge branch 'master' into ccap