Add more bundles, try and speed up CtrlP indexing