Add g alias for git and 's' and 'd' aliases for git commands
Set git merge style to diff3
Setup git to ignore certain runtime config directories