Added difftool to vim and local vimrc for project
Fixed merge