simplify vim setup
Consolidate prezto overrides
compdefs for git functions