Move .profile.local call to before personal PATH

Sometimes I need to include system-wide directories in the path, specific for a
system, but I want to do them before the personal PATH settings under HOME.
Update .gitconfig

Add meld as a difftool.
Add aliases for conflicts and difftoold.
Other minor changes.