ignore vim temporary files
use vim with splice pluging for three-way merging
edit .gitconfig
add aliases for diff and status, add vim with split plugin as merge
tool, fix colour section