Fixes for the new version of Neobundle and Unite