fixup! Consolidate neobundle commands and plugins