Added lol and lola aliases; Shifted meld usage to difftool only; Added some colour=auto entries