Update airline and bufferline
Update airline and bufferline
Merge branch 'master' into edge