Cleanup bundles
Cleanup old options
Add ultisnip options