Update before I switch to unite.vim
Merge