Clean up some colorschemes
Cleanup some bundles
Workaround for Ultisnips and snippets