sets vimdiff as merge tool
less transparency
2 more mappings
removes vim folder
removes vim folder and adds 2 sections to vimrc