Get rid of hacky include local bin
Add several more auto-complete sources
Remove iswitchb customs from new theme as well