Move some declarations to bundles.vim for clean install purposes