Added mappings, vastly improved vundle
Added more bundles, structure