Switch to NeoBundle, clean up old submodules