Huge changes to vimrc and related submodules.

I should clean things up, but can't be bothered right now.