Use vim-airline and other (fairly minor) changes