Merge in vim-powerline-hax.