Merge pull request from chadburrus

Merge branch 'master' of git://github.com/chadburrus/vim-statline
Merge branch 'master' of github.com:cometsong/vim-statline