Clean up titles, add a few things from vim-sensible