.vimrc update

- use ctrlp

- simpler diff colors
don't highlight syntax when merging