Switched back to vim-powerline after experimenting with vim-airline for an evening.

(I liked vim-airline, but it is far from done)