changed to NeoBundle, ditched a bunch of stuff