Fix unite issues, and update neobundle configuration