Vimrc: vim diff, folding, popwindow settings.

Changes:
- vim diff keybinds
- removed setfoldmethod on every buffer change, screws with diff mode.
- updated/re-ordered popwindow close types