Simplify vim config.  Port more configs over from bash