added control p plugin
ignore whitespace in vimdiff, disable mydiff
ignore whitespace in vimdiff, disable mydiff
Merge branch 'control-p'