Reorg airline config
Just show file name in airline
Add DiffToggle function and bindings help with 3-way merges in vimdiff