git-vim for statusline
Merge branch 'master' into neocomplete