fixed vim whitespace function, added vimrc.local sourcing, fixed jedi-vim conflicts
fixed vim whitespace function, added vimrc.local sourcing, fixed jedi-vim conflicts
fixed merge conflicts