Sort bundles
Add SConstruct support
Fix no-grouping autocmd